diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index c684f611a1..52b51e927a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -420,6 +420,10 @@ public final class ConversationUpdateItem extends FrameLayout
   }
 
   private void updateBodyWithTimer() {
+    if (displayBody == null) {
+      return;
+    }
+
     SpannableStringBuilder builder = new SpannableStringBuilder(displayBody);
 
     if (latestFrame != 0) {