diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 1a7a6f9b1b..e56e8a77f0 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -830,7 +830,8 @@ const ProjectController = {
               gitBridgePublicBaseUrl: Settings.gitBridgePublicBaseUrl,
               wsUrl,
               showSupport: Features.hasFeature('support'),
-              gaOptimize: enableOptimize
+              gaOptimize: enableOptimize,
+              customOptimizeEvent: true
             })
             timer.done()
           }
diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug
index b1f468da6b..986291a5fa 100644
--- a/services/web/app/views/layout.pug
+++ b/services/web/app/views/layout.pug
@@ -42,8 +42,10 @@ html(
 			if gaOptimize === true && typeof(gaOptimizeId) != "undefined"
 				script(type='text/javascript').
 					ga('require', '#{gaOptimizeId}')
-					ga('send', 'event', 'pageview',  document.title.substring(0, 499), window.location.href.substring(0, 499))
-				if !experimentId
+				if !customOptimizeEvent
+					script(type='text/javascript').
+						ga('send', 'event', 'pageview',  document.title.substring(0, 499), window.location.href.substring(0, 499))
+				if !ExposedSettings.experimentId
 					//- Anti-flicker snippet
 					//- Only run for tests controlled by Optimize editor
 					style(type='text/css') .async-hide { opacity: 0 !important}