diff --git a/cli/builder.js b/cli/builder.js
index 174d21d7..5b71efd6 100755
--- a/cli/builder.js
+++ b/cli/builder.js
@@ -293,7 +293,7 @@ import C from './${defaultLanguage}/index'
 
 export default function Index(props) {
   const router = useRouter()
-  useEffect(() => { router.replace('/${defaultLanguage}') }, [])
+  useEffect(() => { router.replace('/${defaultLanguage}'+location.search) }, [])
   return <C {...props} />
 }
 
@@ -339,7 +339,7 @@ export default function CatchAll() {
     if (router.query.path[0] === '${defaultLanguage}') {
       return <Error statusCode="404" />
     }
-    router.replace(\`/${defaultLanguage}/\${router.query.path.join('/')}\`)
+    router.replace(\`/${defaultLanguage}/\${router.query.path.join('/')}\${location.search}\`)
   }
   return null
 }
diff --git a/package.json b/package.json
index 179b7360..5f5c8f05 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-translate",
-  "version": "0.17.2-canary.2",
+  "version": "0.17.2-canary.3",
   "description": "Next.js utility to translate pages without the need of a server (static i18n pages generator).",
   "license": "MIT",
   "keywords": [