diff --git a/Config/module.xml b/Config/module.xml
index a54516e..68a9a00 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.7</version>
+    <version>2.1.8</version>
     <authors>
         <author>
             <name>Gilles Bourgeat</name>
diff --git a/EventListener/CanonicalUrlListener.php b/EventListener/CanonicalUrlListener.php
index 3d91513..f40accc 100644
--- a/EventListener/CanonicalUrlListener.php
+++ b/EventListener/CanonicalUrlListener.php
@@ -88,10 +88,7 @@ public function generateUrlCanonical(CanonicalUrlEvent $event): void
             $canonicalUrl = rtrim($canonicalUrl, '/');
             $view = $request->get("_view");
 
-            if(in_array($view, ['category', 'folder'])) {
-                if (null === $page = $request->get('page')){
-                    $page = 1;
-                }
+            if((null !== $page = $request->get('page')) && in_array($view, ['category', 'folder'])) {
 
                 $canonicalUrl .= '?page='.$page;
             }