diff --git a/ChangeLog b/ChangeLog
index 630d06c592..8df90e878c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
 4.7.2 (not yet released)
 - issue #13314 Make theme selection keep current server
 - issue #13311 Fixed direct login for accounts without password
+- issue #13316 Fixed check for mbstring.func_overload
 
 4.7.1 (2017-05-25)
 - issue #13132 Always execute tracking queries as controluser
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index baa49396c8..ffbddfc72d 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -460,8 +460,11 @@ $GLOBALS['PMA_Config']->checkErrors();
 /**
  * As we try to handle charsets by ourself, mbstring overloads just
  * break it, see bug 1063821.
+ *
+ * We specifically use empty here as we are looking for anything else than
+ * empty value or 0.
  */
-if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') != '0') {
+if (@extension_loaded('mbstring') && !empty(@ini_get('mbstring.func_overload'))) {
     PMA_fatalError(
         __(
             'You have enabled mbstring.func_overload in your PHP '