diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt
index c6f6749fd2..d7af83e26e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt
@@ -93,7 +93,11 @@ class ConversationItemDecorations(hasWallpaper: Boolean = false, private val sch
   }
 
   private fun hasHeader(position: Int): Boolean {
-    val model = currentItems[position]
+    val model = if (position in currentItems.indices) {
+      currentItems[position]
+    } else {
+      null
+    }
 
     if (model == null || model !is ConversationMessageElement) {
       return false