diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
index f00a2eadc..c4302f77d 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
@@ -141,7 +141,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
                                             .with(
                                                 isEnabled: false,
                                                 durationSeconds: 0,
-                                                type: nil,
+                                                type: .unknown,
                                                 lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs()
                                             )
                                         self?.shouldShowConfirmButton.send(updatedConfig != config)
@@ -315,7 +315,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
                                                 .with(
                                                     isEnabled: false,
                                                     durationSeconds: 0,
-                                                    type: nil,
+                                                    type: .unknown,
                                                     lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs()
                                                 )
                                             self?.shouldShowConfirmButton.send(updatedConfig != config)
@@ -425,7 +425,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
                                                     .with(
                                                         isEnabled: false,
                                                         durationSeconds: 0,
-                                                        type: nil,
+                                                        type: .unknown,
                                                         lastChangeTimestampMs: SnodeAPI.currentOffsetTimestampMs()
                                                     )
                                                 self?.shouldShowConfirmButton.send(updatedConfig != config)
diff --git a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
index 8645f9297..f4107884e 100644
--- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
+++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
@@ -87,7 +87,7 @@ public extension DisappearingMessagesConfiguration {
             threadId: threadId,
             isEnabled: (isEnabled ?? self.isEnabled),
             durationSeconds: (durationSeconds ?? self.durationSeconds),
-            type: (isEnabled == false) ? nil : (type ?? self.type),
+            type: (isEnabled == false) ? .unknown : (type ?? self.type),
             lastChangeTimestampMs: (lastChangeTimestampMs ?? self.lastChangeTimestampMs)
         )
     }