diff --git a/ChangeLog b/ChangeLog
index db2c98754d..532506dd87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog
 - issue #11605 Changing hostname kills password
 - issue #11614 Undefined variable: db
 - issue #11627 CREATE TABLE/INSERT INTO executed twice (ctrl+enter)
+- issue #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given
 
 4.5.1.0 (2015-10-23)
 - issue        Invalid argument supplied for foreach()
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 1b6aee3d1b..a382bdf319 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -3708,8 +3708,10 @@ function PMA_getHtmlForInitials($array_initials)
         null,
         PMA_DatabaseInterface::QUERY_STORE
     );
-    while (list($tmp_initial) = $GLOBALS['dbi']->fetchRow($initials)) {
-        $array_initials[$tmp_initial] = true;
+    if ($initials) {
+        while (list($tmp_initial) = $GLOBALS['dbi']->fetchRow($initials)) {
+            $array_initials[$tmp_initial] = true;
+        }
     }
 
     // Display the initials, which can be any characters, not