diff --git a/src/Imaging/ImageGenerator.php b/src/Imaging/ImageGenerator.php
index b4a7f4f6a9..cb44c6dde7 100644
--- a/src/Imaging/ImageGenerator.php
+++ b/src/Imaging/ImageGenerator.php
@@ -118,8 +118,8 @@ private function doGenerateByUrl($url, array $params)
         $this->skip_validation = true;
         $this->setParams($params);
 
-        $qs = Str::contains($url, '?') ? Str::after($url, '?') : null;
         $parsed = $this->parseUrl($url);
+        $qs = $parsed['query'];
 
         $this->server->setSource($this->guzzleSourceFilesystem($parsed['base']));
         $this->server->setSourcePathPrefix('/');
@@ -331,6 +331,7 @@ private function parseUrl($url)
         return [
             'path' => Str::after($parsed['path'], '/'),
             'base' => $parsed['scheme'].'://'.$parsed['host'],
+            'query' => $parsed['query'] ?? null,
         ];
     }
 }