diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageCountsViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageCountsViewModel.java
index b02b1969e1..6178fdfb18 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageCountsViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageCountsViewModel.java
@@ -39,6 +39,10 @@ public class MessageCountsViewModel extends ViewModel {
         return counts;
       }
 
+      if (observer != null) {
+        ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
+      }
+
       observer = new DatabaseObserver.Observer() {
         private int previousUnreadCount = -1;