diff --git a/libraries/dbi/DBIMysqli.class.php b/libraries/dbi/DBIMysqli.class.php
index 6c038d6094..3638410d2c 100644
--- a/libraries/dbi/DBIMysqli.class.php
+++ b/libraries/dbi/DBIMysqli.class.php
@@ -217,6 +217,10 @@ class PMA_DBI_Mysqli implements PMA_DBI_Extension
             );
         }
 
+        if ($return_value === false) {
+            return false;
+        }
+
         return $link;
     }