diff --git a/include/auth.inc.php b/include/auth.inc.php
index 5e83f8af..85f70d5b 100644
--- a/include/auth.inc.php
+++ b/include/auth.inc.php
@@ -33,6 +33,7 @@ if (isset($_POST["server"])) {
 		unset($_SESSION["passwords"][$_GET["server"]]);
 		unset($_SESSION["databases"][$_GET["server"]]);
 		unset($_SESSION["tokens"][$_GET["server"]]);
+		unset($_SESSION["history"][$_GET["server"]]);
 		redirect(substr($SELF, 0, -1), lang('Logout successful.'));
 	}
 }
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 5f450ab7..e5d55f4d 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -96,8 +96,8 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
 	$id = "sql-" . count($_SESSION["messages"]);
 	$sql = "";
 	if ($query) {
-		$sql = " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><span id='$id' class='hidden'><br /><code class='jush-sql'>" . htmlspecialchars($query) . '</code> <a href="' . htmlspecialchars($SELF) . 'sql=&amp;history=' . count($_SESSION["history"]) . '">' . lang('Edit') . '</a></span>';
-		$_SESSION["history"][] = $query;
+		$sql = " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><span id='$id' class='hidden'><br /><code class='jush-sql'>" . htmlspecialchars($query) . '</code> <a href="' . htmlspecialchars($SELF) . 'sql=&amp;history=' . count($_SESSION["history"][$_GET["server"]][$_GET["db"]]) . '">' . lang('Edit') . '</a></span>';
+		$_SESSION["history"][$_GET["server"]][$_GET["db"]][] = $query;
 	}
 	if ($execute) {
 		$failed = !$dbh->query($query);
diff --git a/sql.inc.php b/sql.inc.php
index 74454ffc..7096910f 100644
--- a/sql.inc.php
+++ b/sql.inc.php
@@ -67,7 +67,7 @@ if (!$error && $_POST) {
 ?>
 
 <form action="" method="post">
-<p><textarea name="query" rows="20" cols="80" style="width: 98%;"><?php echo htmlspecialchars($_POST ? $_POST["query"] : (strlen($_GET["history"]) ? $_SESSION["history"][$_GET["history"]] : $_GET["sql"])); ?></textarea></p>
+<p><textarea name="query" rows="20" cols="80" style="width: 98%;"><?php echo htmlspecialchars($_POST ? $_POST["query"] : (strlen($_GET["history"]) ? $_SESSION["history"][$_GET["server"]][$_GET["db"]][$_GET["history"]] : $_GET["sql"])); ?></textarea></p>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Execute'); ?>" />