diff --git a/services/web/app/src/Features/Analytics/AnalyticsManager.js b/services/web/app/src/Features/Analytics/AnalyticsManager.js
index 2437d001ed..cdf4698105 100644
--- a/services/web/app/src/Features/Analytics/AnalyticsManager.js
+++ b/services/web/app/src/Features/Analytics/AnalyticsManager.js
@@ -178,7 +178,11 @@ function _setUserProperty({ analyticsId, propertyName, propertyValue }) {
 
 function _isSmokeTestUser(userId) {
   const smokeTestUserId = Settings.smokeTest && Settings.smokeTest.userId
-  return smokeTestUserId != null && userId.toString() === smokeTestUserId
+  return (
+    smokeTestUserId != null &&
+    userId != null &&
+    userId.toString() === smokeTestUserId
+  )
 }
 
 function _isAnalyticsDisabled() {