diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
index bb6ae6d671..43c5d38ed4 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.h
@@ -24,7 +24,8 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType);
 #pragma mark -
 
 typedef NS_ENUM(NSUInteger, PerMessageExpirationState) {
-    PerMessageExpirationState_IncomingExpired = 0,
+    PerMessageExpirationState_Unknown = 0,
+    PerMessageExpirationState_IncomingExpired,
     PerMessageExpirationState_IncomingDownloading,
     PerMessageExpirationState_IncomingFailed,
     PerMessageExpirationState_IncomingAvailable,
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index e8fa05228b..2de18f974b 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -172,8 +172,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
     self.stickerInfo = nil;
     self.stickerAttachment = nil;
     self.isFailedSticker = NO;
-    // This is a safe default value.
-    self.perMessageExpirationState = PerMessageExpirationState_IncomingExpired;
+    self.perMessageExpirationState = PerMessageExpirationState_Unknown;
     self.contactShare = nil;
     self.systemMessageText = nil;
     self.authorConversationColorName = nil;