diff --git a/packages/core/src/Subscribe.tsx b/packages/core/src/Subscribe.tsx
index 7808364a..b6b1c4e6 100644
--- a/packages/core/src/Subscribe.tsx
+++ b/packages/core/src/Subscribe.tsx
@@ -125,6 +125,8 @@ export const Subscribe: React.FC<{
return fallback === undefined ? (
actualChildren
+ ) : subscribedSource === null ? (
+ fallback
) : (
{actualChildren}
)
diff --git a/packages/core/src/useStateObservable.ts b/packages/core/src/useStateObservable.ts
index d27a2a8c..842bab8e 100644
--- a/packages/core/src/useStateObservable.ts
+++ b/packages/core/src/useStateObservable.ts
@@ -14,7 +14,11 @@ type VoidCb = () => void
interface Ref {
source$: StateObservable
- args: [(cb: VoidCb) => VoidCb, () => Exclude]
+ args: [
+ (cb: VoidCb) => VoidCb,
+ () => Exclude,
+ () => Exclude,
+ ]
}
export const useStateObservable = (
@@ -46,7 +50,7 @@ export const useStateObservable = (
callbackRef.current = {
source$: null as any,
- args: [, gv] as any,
+ args: [, gv, gv] as any,
}
}