diff --git a/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
index 107039d..16e9d61 100644
--- a/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
@@ -32,7 +32,7 @@ public function getContext($query_arg = NULL) {
       return $query_string === NULL ? '' : $query_string;
     }
 
-    $value = $this->requestStack->getCurrentRequest()->query->get($query_arg);
+    $value = $this->requestStack->getCurrentRequest()->query->get($query_arg, NULL, TRUE);
     return $value === NULL ? '' : http_build_query([$query_arg => $value], '', '&');
   }