diff --git a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
index 8d881c437..0dc7e0cab 100644
--- a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
+++ b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
@@ -900,7 +900,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
             // iPhone the compact module diffs call the dismissal callback and we present a blank space flow 🙈
             if spaceRoomListProxy == nil {
                 navigationStackCoordinator.setRootCoordinator(nil, animated: false)
-                flowParameters.windowManager.closeAuxiliaryWindow(forType: .room(roomID: roomProxy.id))
+                flowParameters.windowManager.closeAuxiliaryWindow(forType: .room(roomID: roomID))
             }
         }
         
diff --git a/ElementX/Sources/Mocks/AppMediatorMock.swift b/ElementX/Sources/Mocks/AppMediatorMock.swift
index baf67e68c..37ebf259e 100644
--- a/ElementX/Sources/Mocks/AppMediatorMock.swift
+++ b/ElementX/Sources/Mocks/AppMediatorMock.swift
@@ -14,9 +14,13 @@ extension AppMediatorMock {
         
         mock.underlyingAppState = .active
         mock.requestAuthorizationIfNeededUnderlyingReturnValue = true
-        mock.underlyingWindowManager = WindowManagerMock()
         mock.underlyingNetworkMonitor = NetworkMonitorMock.default
         
+        let windowManagerMock = WindowManagerMock()
+        windowManagerMock.closeAllAuxiliaryWindowsClosure = { }
+        windowManagerMock.closeAuxiliaryWindowForTypeClosure = { _ in }
+        mock.underlyingWindowManager = windowManagerMock
+        
         return mock
     }
 }