diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index 301363d63..b489eb3c8 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -144,7 +144,7 @@ class Uri
      */
     public function query($id = null, $raw = false)
     {
-        if (isset($id)) {
+        if (isset($this->query[$id])) {
             return filter_var($this->query[$id], FILTER_SANITIZE_STRING) ;
         } else {
             if ($raw) {