diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php
index 2874f5a0e2..ba6230be0a 100644
--- a/libraries/cleanup.lib.php
+++ b/libraries/cleanup.lib.php
@@ -29,21 +29,22 @@ function PMA_removeRequestVars(&$whitelist)
     foreach ($keys as $key) {
         if (! in_array($key, $whitelist)) {
             unset($_REQUEST[$key], $_GET[$key], $_POST[$key], $GLOBALS[$key]);
-        } else {
-            // allowed stuff could be compromised so escape it
-            // we require it to be a string
-            if (isset($_REQUEST[$key]) && ! is_string($_REQUEST[$key])) {
-                unset($_REQUEST[$key]);
-            }
-            if (isset($_POST[$key]) && ! is_string($_POST[$key])) {
-                unset($_POST[$key]);
-            }
-            if (isset($_COOKIE[$key]) && ! is_string($_COOKIE[$key])) {
-                unset($_COOKIE[$key]);
-            }
-            if (isset($_GET[$key]) && ! is_string($_GET[$key])) {
-                unset($_GET[$key]);
-            }
+            continue;
+        }
+        
+        // allowed stuff could be compromised so escape it
+        // we require it to be a string
+        if (isset($_REQUEST[$key]) && ! is_string($_REQUEST[$key])) {
+            unset($_REQUEST[$key]);
+        }
+        if (isset($_POST[$key]) && ! is_string($_POST[$key])) {
+            unset($_POST[$key]);
+        }
+        if (isset($_COOKIE[$key]) && ! is_string($_COOKIE[$key])) {
+            unset($_COOKIE[$key]);
+        }
+        if (isset($_GET[$key]) && ! is_string($_GET[$key])) {
+            unset($_GET[$key]);
         }
     }
 }