diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index 908a4f8f..90a2c158 100644
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -2,11 +2,9 @@
 if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP changes add.x to add_x
 	restart_session();
 	if ($_POST["drop"]) {
-		set_session("databases", null);
 		queries_redirect(remove_from_uri("db|database"), lang('Database has been dropped.'), drop_databases(array(DB)));
 	} elseif (DB !== $_POST["name"]) {
 		// create or rename database
-		set_session("databases", null); // clear cache
 		if (DB != "") {
 			queries_redirect(preg_replace('~db=[^&]*&~', '', ME) . "db=" . urlencode($_POST["name"]), lang('Database has been renamed.'), rename_database($_POST["name"], $_POST["collation"]));
 		} else {
diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 96e14672..f8b8b834 100644
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -506,6 +506,7 @@ if (!defined("DRIVER")) {
 	* @return string
 	*/
 	function create_database($db, $collation) {
+		set_session("databases", null);
 		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . $connection->quote($collation) : ""));
 	}
 	
@@ -514,6 +515,7 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function drop_databases($databases) {
+		set_session("databases", null);
 		foreach ($databases as $db) {
 			if (!queries("DROP DATABASE " . idf_escape($db))) {
 				return false;