diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
index fd446f541b..ae06517629 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
@@ -387,9 +387,16 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
         }
 
         LaunchedEffect(windowSizeClass) {
-          val anchor = anchors[paneAnchorIndex]
+          val index = when {
+            paneAnchorIndex < 0 -> 1
+            paneAnchorIndex > anchors.lastIndex -> anchors.lastIndex
+            else -> paneAnchorIndex
+          }
 
-          paneExpansionState.animateTo(anchor)
+          if (index in anchors.indices) {
+            val anchor = anchors[index]
+            paneExpansionState.animateTo(anchor)
+          }
         }
 
         val chatNavGraphState = ChatNavGraphState.remember(windowSizeClass)