diff --git a/services/web/app/src/Features/Analytics/AnalyticsManager.js b/services/web/app/src/Features/Analytics/AnalyticsManager.js
index c55bb6a769..5a3e33051c 100644
--- a/services/web/app/src/Features/Analytics/AnalyticsManager.js
+++ b/services/web/app/src/Features/Analytics/AnalyticsManager.js
@@ -7,6 +7,9 @@ const analyticsEditingSessionsQueue = Queues.getAnalyticsEditingSessionsQueue()
 const analyticsUserPropertiesQueue = Queues.getAnalyticsUserPropertiesQueue()
 
 function identifyUser(userId, oldUserId) {
+  if (!userId || !oldUserId) {
+    return
+  }
   if (isAnalyticsDisabled() || isSmokeTestUser(userId)) {
     return
   }
@@ -22,6 +25,9 @@ function identifyUser(userId, oldUserId) {
 }
 
 function recordEvent(userId, event, segmentation) {
+  if (!userId) {
+    return
+  }
   if (isAnalyticsDisabled() || isSmokeTestUser(userId)) {
     return
   }
@@ -37,6 +43,9 @@ function recordEvent(userId, event, segmentation) {
 }
 
 function updateEditingSession(userId, projectId, countryCode) {
+  if (!userId) {
+    return
+  }
   if (isAnalyticsDisabled() || isSmokeTestUser(userId)) {
     return
   }
@@ -61,6 +70,9 @@ function updateEditingSession(userId, projectId, countryCode) {
 }
 
 function setUserProperty(userId, propertyName, propertyValue) {
+  if (!userId) {
+    return
+  }
   if (isAnalyticsDisabled() || isSmokeTestUser(userId)) {
     return
   }