diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
index f216e8bbe..eab704025 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewModel.m
@@ -1336,6 +1336,12 @@ static const int kYapDatabaseRangeMinLength = 0;
 - (void)typingIndicatorStateDidChange:(NSNotification *)notification
 {
     OWSAssertIsOnMainThread();
+    OWSAssertDebug([notification.object isKindOfClass:[NSString class]]);
+    OWSAssertDebug(self.thread);
+
+    if (![notification.object isEqual:self.thread.uniqueId]) {
+        return;
+    }
 
     self.typingIndicatorsSender = [self.typingIndicators typingRecipientIdForThread:self.thread];
 }
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
index 50737bb60..8fbf77420 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
@@ -545,6 +545,12 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)typingIndicatorStateDidChange:(NSNotification *)notification
 {
     OWSAssertIsOnMainThread();
+    OWSAssertDebug([notification.object isKindOfClass:[NSString class]]);
+    OWSAssertDebug(self.thread);
+
+    if (![notification.object isEqual:self.thread.threadRecord.uniqueId]) {
+        return;
+    }
 
     [self updatePreview];
 }