diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 135f6e9a..2c8c298d 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -54,12 +54,16 @@ export default {
             return '';
         },
         async validateSession() {
+            const emptySessionId = '00000000-0000-0000-0000-000000000000';
 
             if (this.noSession()) {
-                await this.initSession();                
+                await this.initSession();
             }
 
-            updateSessionIdCookie();
+            const sessionId = getSessionIdValue();
+            if (sessionId && sessionId !== emptySessionId) {
+                updateSessionIdCookie();
+            }
         },
         async logPageView(pageEvent) {
             const store = useMainStore();
diff --git a/src/router/index.js b/src/router/index.js
index 791b23d6..2a332ab6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -35,11 +35,7 @@ const routes = [
                 return await GoToAccessIsDenied(next);
             }
 
-            if (analyticsMixin.methods.noSession()) {
-                await analyticsMixin.methods.initSession();
-            } else {
-                updateSessionIdCookie();
-            }
+            await analyticsMixin.methods.validateSession();
 
             // Do not run these for the main entry page - as it is not part of the user flow.
             if (issPageToUse !== issPageValues.ENTRY_PAGE) {