diff --git a/libs/common/src/tools/state/user-state-subject.ts b/libs/common/src/tools/state/user-state-subject.ts
index 7614011ecc..25bb0b08f4 100644
--- a/libs/common/src/tools/state/user-state-subject.ts
+++ b/libs/common/src/tools/state/user-state-subject.ts
@@ -252,6 +252,14 @@ export class UserStateSubject<
       // * `input` needs to wait until a message flows through the pipe
       withConstraints,
       map(([loadedState, constraints]) => {
+        // bypass nulls
+        if (!loadedState) {
+          return {
+            constraints: {} as Constraints<State>,
+            state: null,
+          } satisfies Constrained<State>;
+        }
+
         const calibration = isDynamic(constraints)
           ? constraints.calibrate(loadedState)
           : constraints;