diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
index af16b65180..b4e05c0c79 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
@@ -358,8 +358,10 @@ public class ConversationAdapter<V extends View & BindableConversationItem>
    */
   void pulseHighlightItem(int position) {
     if (position >= 0 && position < getItemCount()) {
-      recordToPulseHighlight = getItem(position);
-      notifyItemChanged(position);
+      int correctedPosition = isHeaderPosition(position) ? position + 1 : position;
+
+      recordToPulseHighlight = getItem(correctedPosition);
+      notifyItemChanged(correctedPosition);
     }
   }