core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
index 75d1a0f..0a61193 100644
--- a/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
@@ -27,13 +27,8 @@ public function getContext($query_arg = NULL) {
     if ($query_arg === NULL) {
       return $this->requestStack->getCurrentRequest()->getQueryString();
     }
-    else {
-      if (!$this->requestStack->getCurrentRequest()->query->has($query_arg)) {
-        return NULL;
-      }
-      else {
-        return $this->requestStack->getCurrentRequest()->query->get($query_arg) ?: '?valueless?';
-      }
+    elseif ($this->requestStack->getCurrentRequest()->query->has($query_arg)) {
+      return $this->requestStack->getCurrentRequest()->query->get($query_arg) ?: '?valueless?';
     }
   }