diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php
index 16329f4636..8efe43b66c 100644
--- a/libraries/DBQbe.class.php
+++ b/libraries/DBQbe.class.php
@@ -1621,8 +1621,10 @@ class PMA_DbQbe
         // Will incldue master tables and all tables that can be combined into
         // a cluster by their relation
         $finalized = array();
-        // Add master tables
-        $finalized[$master] = '';
+        if (mb_strlen($master) > 0) {
+            // Add master tables
+            $finalized[$master] = '';
+        }
 
         while (true) {
             $added = false;