diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index 820aec0a..f2449a75 100644
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -201,12 +201,14 @@ function connect() {
 	return $dbh->error;
 }
 
-function get_databases() {
-	// SHOW DATABASES can take very long so it is cached
+function get_databases($flush = true) {
+	// SHOW DATABASES can take a very long time so it is cached
 	$return = &$_SESSION["databases"][$_GET["server"]];
 	if (!isset($return)) {
-		ob_flush();
-		flush();
+		if ($flush) {
+			ob_flush();
+			flush();
+		}
 		$return = get_vals("SHOW DATABASES");
 	}
 	return $return;
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index a5a113d8..b866ed31 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -8,7 +8,7 @@ function adminer_credentials() {
 }
 
 function adminer_database() {
-	$dbs = get_databases();
+	$dbs = get_databases(false);
 	return call_adminer('database', (count($dbs) == 1 ? $dbs[0] : (count($dbs) == 2 && information_schema($dbs[0]) ? $dbs[1] : 'test')));
 }