diff --git a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
index 7a37092f7..24361408f 100644
--- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
+++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
@@ -376,6 +376,10 @@ extension DisappearingMessagesConfiguration {
                         TimeInterval(60),
                         at: 0
                     )
+                    result.insert(
+                        TimeInterval(30),
+                        at: 0
+                    )
                     result.insert(
                         TimeInterval(10),
                         at: 0
@@ -391,6 +395,10 @@ extension DisappearingMessagesConfiguration {
                 ]
                 .map { TimeInterval($0)  }
                 #if targetEnvironment(simulator)
+                    result.insert(
+                        TimeInterval(30),
+                        at: 0
+                    )
                     result.insert(
                         TimeInterval(10),
                         at: 0