diff --git a/lib/frontend/screens/calls/calls_tab.dart b/lib/frontend/screens/calls/calls_tab.dart
index 09edce7..7e08f23 100644
--- a/lib/frontend/screens/calls/calls_tab.dart
+++ b/lib/frontend/screens/calls/calls_tab.dart
@@ -30,7 +30,13 @@ class _CallsTabState extends State<CallsTab> {
     }
 
     final callsModule = CallsModule(api);
-    final calls = await callsModule.fetchHistory(p.id, p.id);
+    List<CallLogEntry> calls;
+    try {
+      calls = await callsModule.fetchHistory(p.id, p.id);
+    } catch (e) {
+      if (mounted) setState(() => _isLoading = false);
+      return;
+    }
 
     final List<CallLogEntry> grouped = [];
     for (final call in calls) {
diff --git a/lib/frontend/screens/chats/chat_list_screen.dart b/lib/frontend/screens/chats/chat_list_screen.dart
index be2dacf..b52a632 100644
--- a/lib/frontend/screens/chats/chat_list_screen.dart
+++ b/lib/frontend/screens/chats/chat_list_screen.dart
@@ -1255,6 +1255,7 @@ class _ChatListScreenState extends State<ChatListScreen>
               });
             },
             child: Stack(
+              clipBehavior: Clip.hardEdge,
               children: [
                 AnimatedPositioned(
                   duration: _navDragging