diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java
index f06144dc5f..3042205049 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java
@@ -130,23 +130,16 @@ class ConversationDataSource extends PositionalDataSource<MessageRecord> {
   }
 
   static class Invalidator {
-    private boolean  invalidated;
     private Runnable callback;
 
     synchronized void invalidate() {
-      invalidated = true;
-
       if (callback != null) {
         callback.run();
       }
     }
 
     private synchronized void observe(@NonNull Runnable callback) {
-      if (invalidated) {
-        callback.run();
-      } else {
-        this.callback = callback;
-      }
+      this.callback = callback;
     }
   }