diff --git a/SessionMessagingKit/Messages/Control Messages/CallMessage.swift b/SessionMessagingKit/Messages/Control Messages/CallMessage.swift
index 9e876d071..f37d0c37f 100644
--- a/SessionMessagingKit/Messages/Control Messages/CallMessage.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/CallMessage.swift	
@@ -188,6 +188,10 @@ public final class CallMessage: ControlMessage {
         }
         
         let contentProto = SNProtoContent.builder()
+        
+        // DisappearingMessagesConfiguration
+        setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto, threadId: threadId)
+        
         do {
             contentProto.setCallMessage(try callMessageProto.build())
             
@@ -197,9 +201,6 @@ public final class CallMessage: ControlMessage {
             SNLog("Couldn't construct call message proto from: \(self).")
             return nil
         }
-        
-        // DisappearingMessagesConfiguration
-        setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto, threadId: threadId)
     }
     
     // MARK: - Description