diff --git a/services/web/app/src/Features/Templates/TemplatesRouter.js b/services/web/app/src/Features/Templates/TemplatesRouter.js
index 567e0edfa9..31b3caf26c 100644
--- a/services/web/app/src/Features/Templates/TemplatesRouter.js
+++ b/services/web/app/src/Features/Templates/TemplatesRouter.js
@@ -8,22 +8,22 @@ module.exports = {
   apply(app) {
     app.get(
       '/project/new/template/:Template_version_id',
+      AnalyticsRegistrationSourceMiddleware.setSource('template'),
       TemplatesMiddleware.saveTemplateDataInSession,
       AuthenticationController.requireLogin(),
-      TemplatesController.getV1Template
+      TemplatesController.getV1Template,
+      AnalyticsRegistrationSourceMiddleware.clearSource()
     )
 
     app.post(
       '/project/new/template',
-      AnalyticsRegistrationSourceMiddleware.setSource('template'),
       AuthenticationController.requireLogin(),
       RateLimiterMiddleware.rateLimit({
         endpointName: 'create-project-from-template',
         maxRequests: 20,
         timeInterval: 60,
       }),
-      TemplatesController.createProjectFromV1Template,
-      AnalyticsRegistrationSourceMiddleware.clearSource()
+      TemplatesController.createProjectFromV1Template
     )
   },
 }