diff --git a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
index 23083d8a9..2ab6229f4 100644
--- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
+++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m
@@ -67,6 +67,9 @@ static NSString *const OWSDisappearingMessageFinderExpiresAtIndex = @"index_mess
                                               if (!incomingMessage.wasRead) {
                                                   return;
                                               }
+                                          } else {
+                                              // update if we ever support other disappearing message types
+                                              OWSProdLogAndFail([message isKindOfClass:[TSOutgoingMessage class]]);
                                           }
                                           [messageIds addObject:key];
                                       }