diff --git a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
index 527b92b33..7c54842d6 100644
--- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
+++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
@@ -252,7 +252,7 @@ extension DisappearingMessagesConfiguration {
                     (2 * 7 * 24 * 60 * 60)
                 ]
                 .map { TimeInterval($0)  }
-                #if DEBUG
+                #if targetEnvironment(simulator)
                     result.insert(
                         TimeInterval(10),
                         at: 0
@@ -267,7 +267,7 @@ extension DisappearingMessagesConfiguration {
                     (2 * 7 * 24 * 60 * 60)
                 ]
                 .map { TimeInterval($0)  }
-                #if DEBUG
+                #if targetEnvironment(simulator)
                     result.insert(
                         TimeInterval(10),
                         at: 0