diff --git a/src/room/RoomPage.tsx b/src/room/RoomPage.tsx
index b3b9242d..544f100b 100644
--- a/src/room/RoomPage.tsx
+++ b/src/room/RoomPage.tsx
@@ -132,9 +132,9 @@ export const RoomPage: FC = () => {
     <>
       {content}
       {/* On Android and iOS, show a prompt to launch the mobile app. */}
-      {appPrompt && (platform === "android" || platform === "ios") && (
-        <AppSelectionModal roomId={roomId} />
-      )}
+      {appPrompt &&
+        (platform === "android" || platform === "ios") &&
+        roomId && <AppSelectionModal roomId={roomId} />}
     </>
   );
 };
diff --git a/src/room/useLoadGroupCall.ts b/src/room/useLoadGroupCall.ts
index 1cf33ffd..f01e690a 100644
--- a/src/room/useLoadGroupCall.ts
+++ b/src/room/useLoadGroupCall.ts
@@ -157,7 +157,7 @@ export const useLoadGroupCall = (
         room = client.getRoom(roomSummary.room_id);
         if (room?.getMyMembership() === KnownMembership.Join) {
           // room already joined so we are done here already.
-          return room;
+          return room!;
         } else if (room?.getMyMembership() === KnownMembership.Ban) {
           throw new BannedError();
         } else {