diff --git a/src/utils/reactive/SwitchObservable.ts b/src/utils/reactive/SwitchObservable.ts
index f22a7f5f..81b28852 100644
--- a/src/utils/reactive/SwitchObservable.ts
+++ b/src/utils/reactive/SwitchObservable.ts
@@ -24,7 +24,8 @@ export class SwitchObservable<T> extends Observable<T> {
   }
 
   switch(newObservable$: Observable<T>) {
-    this.subject$.next(newObservable$);
+    // If newObservable$ is null or undefined, use EMPTY instead
+    this.subject$.next(newObservable$ || EMPTY);
   }
 
   complete() {