diff --git a/src/domain/session/RoomGridViewModel.js b/src/domain/session/RoomGridViewModel.js
index 9e8880e4..04e810fb 100644
--- a/src/domain/session/RoomGridViewModel.js
+++ b/src/domain/session/RoomGridViewModel.js
@@ -132,7 +132,10 @@ export class RoomGridViewModel extends ViewModel {
                     this._viewModels[i] = this.disposeTracked(vm);
                 }
                 if (newId) {
-                    this._viewModels[i] = this.track(this._createRoomViewModel(newId));
+                    const newVM = this._createRoomViewModel(newId);
+                    if (newVM) {
+                        this._viewModels[i] = this.track(newVM);
+                    }
                 }
                 changed = true;
             }
diff --git a/src/domain/session/SessionViewModel.js b/src/domain/session/SessionViewModel.js
index 1d305b20..07fc3792 100644
--- a/src/domain/session/SessionViewModel.js
+++ b/src/domain/session/SessionViewModel.js
@@ -122,7 +122,10 @@ export class SessionViewModel extends ViewModel {
                 if (vm) {
                     this._currentRoomViewModel = this.track(vm);
                 } else {
-                    this._currentRoomViewModel = this.track(this._createRoomViewModel(currentRoomId.value));
+                    const newVM = this._createRoomViewModel(currentRoomId.value);
+                    if (newVM) {
+                        this._currentRoomViewModel = this.track(newVM);
+                    }
                 }
             }
             this._gridViewModel = this.disposeTracked(this._gridViewModel);