diff --git a/ChangeLog b/ChangeLog
index 7c1b84d7e..e6991b539 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [auth] do not allow root user without password unless explicitly enabled by
   AllowEmptyRoot
 + rfe #1778908 [auth] arbitrary server auth can now also accept port
+- patch #2089240 [export] handle correctly switching SQL modes
 
 3.0.0.0 (not yet released)
 + [export] properly handle line breaks for YAML, thanks to Dan Barry -
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 05ba4c1ef..a58fcd12b 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -189,8 +189,13 @@ function PMA_exportHeader()
     global $cfg;
     global $mysql_charset_map;
 
-    if (isset($GLOBALS['sql_compatibility']) && $GLOBALS['sql_compatibility'] != 'NONE') {
-        PMA_DBI_try_query('SET SQL_MODE="' . $GLOBALS['sql_compatibility'] . '"');
+    if (isset($GLOBALS['sql_compatibility'])) {
+        $tmp_compat = $GLOBALS['sql_compatibility'];
+        if ($tmp_compat == 'NONE') {
+            $tmp_compat = '';
+        }
+        PMA_DBI_try_query('SET SQL_MODE="' . $tmp_compat . '"');
+        unset($tmp_compat);
     }
     $head  =  PMA_exportComment('phpMyAdmin SQL Dump')
            .  PMA_exportComment('version ' . PMA_VERSION)