diff --git a/GeeksCoreLibrary/Modules/Templates/Middlewares/RewriteUrlToTemplateMiddleware.cs b/GeeksCoreLibrary/Modules/Templates/Middlewares/RewriteUrlToTemplateMiddleware.cs
index 91fb9695..c0cbd60a 100644
--- a/GeeksCoreLibrary/Modules/Templates/Middlewares/RewriteUrlToTemplateMiddleware.cs
+++ b/GeeksCoreLibrary/Modules/Templates/Middlewares/RewriteUrlToTemplateMiddleware.cs
@@ -300,6 +300,9 @@ private async Task HandleRewritesAsync(HttpContext context, string path, QuerySt
                 continue;
             }
 
+            // Extra query string in the template.
+            queryString = CombineQueryString(queryString, queryStringFromUrl.Value);
+
             var template = await templatesService.GetTemplateAsync(number);
             if (template is QueryTemplate { UsedForRedirect: true })
             {
@@ -335,9 +338,6 @@ private async Task HandleRewritesAsync(HttpContext context, string path, QuerySt
                 queryString = CombineQueryString(queryString, $"?templateid={urlMatchLastPart.Replace("?", "&")}");
             }
 
-            // Extra query string in the template.
-            queryString = CombineQueryString(queryString, queryStringFromUrl.Value);
-
             // It is a template.
             context.Request.Path = "/template.gcl";
             context.Request.QueryString = queryString;