diff --git a/ChangeLog b/ChangeLog
index 425ea46681..eb376ea5c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@ phpMyAdmin - ChangeLog
 - issue #11820 Fix hiding of page content behind menu
 - issue #11780 FROM clause not generated after loading search bookmark
 - issue #11826 Fix creating/editing VIEW with DEFINER containing special chars
+- issue #11828 Do not invoke FLUSH PRIVILEGES when server in --skip-grant-tables
 
 4.5.3.1 (2015-12-25)
 - issue #11774 Undefined offset 2
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index 58e2f1200d..4517e3730d 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -401,12 +401,17 @@ if ($user == '@') { // MySQL is started with --skip-grant-tables
     $GLOBALS['db_to_create']      = '';
     $GLOBALS['dbs_where_create_table_allowed'] = array('*');
     $GLOBALS['dbs_to_test']       = false;
+    $GLOBALS['flush_priv'] = true;
+    $GLOBALS['db_priv'] = true;
+    $GLOBALS['col_priv'] = true;
+    $GLOBALS['table_priv'] = true;
+    $GLOBALS['proc_priv'] = true;
 } else {
     PMA_analyseShowGrant();
-}
 
-// Check if privileges to 'mysql'.col_privs, 'mysql'.db,
-// 'mysql'.table_privs, 'mysql'.proc_privs and privileges for
-// flushing the privileges are available
-PMA_checkRequiredPrivilegesForFlushing();
-PMA_checkRequiredPrivilegesForAdjust();
+    // Check if privileges to 'mysql'.col_privs, 'mysql'.db,
+    // 'mysql'.table_privs, 'mysql'.proc_privs and privileges for
+    // flushing the privileges are available
+    PMA_checkRequiredPrivilegesForFlushing();
+    PMA_checkRequiredPrivilegesForAdjust();
+}