diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 1b6f3f269c..97f583989f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -1096,6 +1096,10 @@ public class ConversationFragment extends LoggingFragment {
     }
 
     int position = getListLayoutManager().findFirstVisibleItemPosition();
+    if (position == getListAdapter().getItemCount() - 1) {
+      return;
+    }
+
     if (position >= (isTypingIndicatorShowing() ? 1 : 0)) {
       ConversationMessage item = getListAdapter().getItem(position);
       if (item != null) {