diff --git a/packages/core/src/analytics.ts b/packages/core/src/analytics.ts
index 1e500c59c..9545c0e05 100644
--- a/packages/core/src/analytics.ts
+++ b/packages/core/src/analytics.ts
@@ -491,7 +491,7 @@ export class SegmentClient {
 
     this.store.userInfo.set({
       ...userInfo,
-      ...(userId !== undefined ? { userId } : {}),
+      userId: userId ?? userInfo.userId,
       traits: mergedTraits,
     });
 
diff --git a/packages/core/src/storage/sovranStorage.ts b/packages/core/src/storage/sovranStorage.ts
index 4b918ada6..674aa0c7f 100644
--- a/packages/core/src/storage/sovranStorage.ts
+++ b/packages/core/src/storage/sovranStorage.ts
@@ -7,6 +7,7 @@ import type {
   Context,
   UserInfoState,
 } from '..';
+import { getUUID } from '../uuid';
 import type { Storage } from './types';
 
 type Data = {
@@ -24,7 +25,7 @@ const INITIAL_VALUES: Data = {
   context: {},
   settings: {},
   userInfo: {
-    anonymousId: 'anonymousId',
+    anonymousId: getUUID(),
     userId: undefined,
     traits: undefined,
   },