diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 50359a2..3359f21 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -181,7 +181,7 @@ public function generateFromRoute($name, $parameters = array(), $options = array
     }
 
     // Append the query.
-    if (isset($options['query'])) {
+    if (!empty($options['query'])) {
       $path .= (strpos($path, '?') !== FALSE ? '&' : '?') . Url::buildQuery((array) $options['query']);
     }
     $base_url = $this->context->getBaseUrl();