diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
index 747a314d8..44b7a2919 100644
--- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
@@ -175,7 +175,8 @@ extension MessageReceiver {
         message: ExpirationTimerUpdate,
         proto: SNProtoContent
     ) throws {
-        guard 
+        guard proto.hasExpirationType || proto.hasExpirationTimer else { return }
+        guard
             let sender: String = message.sender,
             let timestampMs: UInt64 = message.sentTimestamp,
             Features.useNewDisappearingMessagesConfig