diff --git a/ChangeLog b/ChangeLog
index e3add30bd..10d1b7314 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -132,6 +132,7 @@
 - rfe #3158867 [privileges] No DROP DATABASE warning if you delete a user
 - [interface] Add link to documentation for status variables.
 - [security] Redirect external links to avoid Referer leakage.
+- [interface] Default to not count tables in database.
 
 3.3.10.0 (not yet released)
 - patch #3147400 [structure] Aria table size printed as unknown,
diff --git a/libraries/config.default.php b/libraries/config.default.php
index a544caff8..d7df77e49 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -425,7 +425,7 @@ $cfg['Servers'][$i]['ShowDatabasesCommand'] = 'SHOW DATABASES';
  *
  * @global array $cfg['Servers'][$i]['CountTables']
  */
-$cfg['Servers'][$i]['CountTables'] = true;
+$cfg['Servers'][$i]['CountTables'] = false;
 
 /**
  * Whether the tracking mechanism creates versions for tables and views automatically.
@@ -488,7 +488,7 @@ $cfg['ServerDefault'] = 1;
  * Other core phpMyAdmin settings
  */
 /**
- * whether Ajax behavior is active 
+ * whether Ajax behavior is active
  *
  * @global boolean $cfg['AjaxEnable']
  */
@@ -1179,7 +1179,7 @@ $cfg['Export']['file_template_server'] = '@SERVER@';
 $cfg['Export']['codegen_structure_or_data'] = 'data';
 
 /**
- * 
+ *
  *
  * @global $cfg['Export']['codegen_format']
  */
@@ -2179,7 +2179,7 @@ $cfg['TextareaCols'] = 40;
 $cfg['TextareaRows'] = 15;
 
 /**
- * double size of textarea size for LONGTEXT columns 
+ * double size of textarea size for LONGTEXT columns
  *
  * @global boolean $cfg['LongtextDoubleTextarea']
  */