diff --git a/ChangeLog b/ChangeLog
index 70762ef4f8..6304516860 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog
 + rfe #1537 PHP OpenSSL support for cookie encryption/decryption
 
 4.2.13.0 (not yet released)
+- bug #4604 Query history not being deleted
 
 4.2.12.0 (2014-11-20)
 - bug #4574 Blank/white page when JavaScript disabled
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 5a4a4e3180..2d29bccda0 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -969,6 +969,9 @@ function PMA_setHistory($db, $table, $username, $sqlquery)
                NOW(),
                \'' . PMA_Util::sqlAddSlashes($sqlquery) . '\')'
     );
+
+    PMA_purgeHistory($username);
+
 } // end of 'PMA_setHistory()' function
 
 /**