diff --git a/apps/mobile/lib/matrix/client.dart b/apps/mobile/lib/matrix/client.dart
index 9b5f902..59f1e01 100644
--- a/apps/mobile/lib/matrix/client.dart
+++ b/apps/mobile/lib/matrix/client.dart
@@ -9,6 +9,7 @@ import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 import 'package:sqflite/sqflite.dart' as sqflite;
 
+import 'calls.dart';
 import 'sliding_sync.dart';
 
 /// The name the session's device gets on the homeserver.
@@ -60,7 +61,10 @@ Future<Client> createClient({bool startSync = true}) async {
       vodozemacInit: () => vod.init(),
     ),
     logLevel: kReleaseMode ? Level.warning : Level.info,
-    importantStateEvents: {'im.ponies.room_emotes'},
+    // Kept in memory for every room, not just opened ones: the room list
+    // marks rooms with a call going on, and a ring needs to know who is in
+    // the call.
+    importantStateEvents: {'im.ponies.room_emotes', Calls.memberType},
     // Refresh tokens: a soft logout (an expired access token) is answered by
     // refreshing it rather than by signing the user out.
     onSoftLogout: (client) => client.refreshAccessToken(),
diff --git a/apps/mobile/lib/screens/call_screen.dart b/apps/mobile/lib/screens/call_screen.dart
index c10ea61..6383c5f 100644
--- a/apps/mobile/lib/screens/call_screen.dart
+++ b/apps/mobile/lib/screens/call_screen.dart
@@ -427,8 +427,11 @@ Future<void> showIncomingCall(
       final call = calls.incoming;
       if (call == null) {
         // Answered elsewhere, declined, or it stopped ringing.
+        // Only while the sheet is on top: after Answer, the call screen
+        // is, and popping would close it instead.
         WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (Navigator.of(sheet).canPop()) Navigator.of(sheet).pop();
+          final route = ModalRoute.of(sheet);
+          if (route != null && route.isCurrent) Navigator.of(sheet).pop();
         });
         return const SizedBox(height: 200);
       }
@@ -462,7 +465,10 @@ Future<void> showIncomingCall(
                     icon: Icons.call_end,
                     label: 'Decline',
                     colour: c.danger,
-                    onTap: () => calls.decline(),
+                    onTap: () {
+                      Navigator.of(sheet).pop();
+                      calls.decline();
+                    },
                   ),
                   if (call.video)
                     _RoundButton(
@@ -470,6 +476,7 @@ Future<void> showIncomingCall(
                       label: 'Voice only',
                       colour: c.tealStrong,
                       onTap: () {
+                        Navigator.of(sheet).pop();
                         calls.answer(withVideo: false);
                         navigator.push(CallScreen.route());
                       },
@@ -479,6 +486,7 @@ Future<void> showIncomingCall(
                     label: 'Answer',
                     colour: c.tealStrong,
                     onTap: () {
+                      Navigator.of(sheet).pop();
                       calls.answer();
                       navigator.push(CallScreen.route());
                     },