diff --git a/src/OAuth2/Controller/AuthorizeController.php b/src/OAuth2/Controller/AuthorizeController.php
index 181f884a..334803e8 100644
--- a/src/OAuth2/Controller/AuthorizeController.php
+++ b/src/OAuth2/Controller/AuthorizeController.php
@@ -141,6 +141,10 @@ public function handleAuthorizeRequest(RequestInterface $request, ResponseInterf
 
         list($redirect_uri, $uri_params) = $authResult;
 
+        if (is_array($uri_params) && isset($uri_params['query']) && is_array($uri_params['query'])) {
+            $response->addParameters($uri_params['query']);
+        }
+
         if (empty($redirect_uri) && !empty($registered_redirect_uri)) {
             $redirect_uri = $registered_redirect_uri;
         }