diff --git a/ChangeLog b/ChangeLog
index 2c791ac4d..5a44159e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -123,6 +123,7 @@
 - bug #3115519 [interface] Prevent long queries from being shown in confirmation popup
 - patch #3112792 [navi] Left panel table grouping incorrect,
   thanks to garas - garas
+- bug #3123433 [interface] Avoid double escaping of MySQL errors.
 
 3.3.9.0 (not yet released)
 - bug [doc] Fix references to MySQL doc
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index bbd04f7b4..ca9901414 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -617,7 +617,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
     } // end if
 
     if (!empty($error_message)) {
-        $error_message = htmlspecialchars($error_message);
         $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message);
     }
     // modified to show the help on error-returns
diff --git a/sql.php b/sql.php
index c0ab15c7e..1db0180ab 100644
--- a/sql.php
+++ b/sql.php
@@ -377,12 +377,12 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
                 $table = '';
             }
             $active_page = $goto;
-            $message = PMA_Message::rawError(htmlspecialchars($error));
+            $message = PMA_Message::rawError($error);
 
             if( $GLOBALS['is_ajax_request'] == true) {
                 PMA_ajaxResponse($message, false);
             }
-            
+
             /**
              * Go to target path.
              */