diff --git a/src/domain/session/SessionViewModel.js b/src/domain/session/SessionViewModel.js
index 38b72968..0d3a94d5 100644
--- a/src/domain/session/SessionViewModel.js
+++ b/src/domain/session/SessionViewModel.js
@@ -115,7 +115,11 @@ export class SessionViewModel extends ViewModel {
         } else if (this._gridViewModel && !roomIds) {
             if (currentRoomId) {
                 const vm = this._gridViewModel.releaseRoomViewModel(currentRoomId.value);
-                this._currentRoomViewModel = this.track(vm);
+                if (vm) {
+                    this._currentRoomViewModel = this.track(vm);
+                } else {
+                    this._currentRoomViewModel = this.track(this._createRoomViewModel(currentRoomId.value));
+                }
             }
             this._gridViewModel = this.disposeTracked(this._gridViewModel);
         }