diff --git a/Config/module.xml b/Config/module.xml
index b5c1397..e2efa09 100644
--- a/Config/module.xml
+++ b/Config/module.xml
@@ -13,7 +13,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <authors>
         <author>
             <name>Gilles Bourgeat</name>
diff --git a/EventListener/CanonicalUrlListener.php b/EventListener/CanonicalUrlListener.php
index eb27c77..5e8674e 100644
--- a/EventListener/CanonicalUrlListener.php
+++ b/EventListener/CanonicalUrlListener.php
@@ -87,13 +87,7 @@ public function generateUrlCanonical(CanonicalUrlEvent $event): void
 
             $canonicalUrl = rtrim($canonicalUrl, '/');
         } else {
-            if (null === $queryString = $request->server->get('QUERY_STRING')) {
-                $queryString = $request->getQueryString();
-            }
-
-            if (!empty($queryString)) {
-                $canonicalUrl .= '/?'.$queryString;
-            }
+            $canonicalUrl .= '/?'. (array_key_exists("query", $parseUrlByCurrentLocale)) ? $parseUrlByCurrentLocale['query'] : "";
         }
 
         try {