diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m
index 5a1628a04..6530261a9 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m
@@ -195,7 +195,7 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     TSMessage *message = (TSMessage *)viewItem.interaction;
-    return message.shouldStartExpireTimer;
+    return message.isExpiringMessage;
 }
 
 - (void)configureLabelsWithConversationViewItem:(ConversationViewItem *)viewItem
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 63c1cbd70..ef8e6b0fd 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -4807,7 +4807,7 @@ typedef enum : NSUInteger {
             TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)viewItem.interaction;
             MessageReceiptStatus receiptStatus =
                 [MessageRecipientStatusUtils recipientStatusWithOutgoingMessage:outgoingMessage];
-            BOOL isDisappearingMessage = outgoingMessage.shouldStartExpireTimer;
+            BOOL isDisappearingMessage = outgoingMessage.isExpiringMessage;
 
             if (nextViewItem && nextViewItem.interaction.interactionType == interactionType) {
                 TSOutgoingMessage *nextOutgoingMessage = (TSOutgoingMessage *)nextViewItem.interaction;
@@ -4846,7 +4846,7 @@ typedef enum : NSUInteger {
             TSIncomingMessage *incomingMessage = (TSIncomingMessage *)viewItem.interaction;
             NSString *incomingSenderId = incomingMessage.authorId;
             OWSAssert(incomingSenderId.length > 0);
-            BOOL isDisappearingMessage = incomingMessage.shouldStartExpireTimer;
+            BOOL isDisappearingMessage = incomingMessage.isExpiringMessage;
 
             NSString *_Nullable nextIncomingSenderId = nil;
             if (nextViewItem && nextViewItem.interaction.interactionType == interactionType) {