diff --git a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
index bee8227eb..e2c60521d 100644
--- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
+++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
@@ -254,7 +254,7 @@ extension DisappearingMessagesConfiguration {
                 .map { TimeInterval($0)  }
                 #if targetEnvironment(simulator)
                     result.insert(
-                        TimeInterval(60),
+                        TimeInterval(2 * 60),
                         at: 0
                     )
                     result.insert(
@@ -272,10 +272,6 @@ extension DisappearingMessagesConfiguration {
                 ]
                 .map { TimeInterval($0)  }
                 #if targetEnvironment(simulator)
-                    result.insert(
-                        TimeInterval(60),
-                        at: 0
-                    )
                     result.insert(
                         TimeInterval(10),
                         at: 0
diff --git a/SessionMessagingKit/Jobs/Types/GetExpirationJob.swift b/SessionMessagingKit/Jobs/Types/GetExpirationJob.swift
index df14fe965..53a8dddd1 100644
--- a/SessionMessagingKit/Jobs/Types/GetExpirationJob.swift
+++ b/SessionMessagingKit/Jobs/Types/GetExpirationJob.swift
@@ -28,7 +28,15 @@ public enum GetExpirationJob: JobExecutor {
             return
         }
         
-        var expirationInfo: [String: TimeInterval] = details.expirationInfo
+        var expirationInfo: [String: TimeInterval] = Storage.shared.read { db -> [String: TimeInterval] in
+            details
+                .expirationInfo
+                .filter {
+                    Interaction.filter(Interaction.Columns.serverHash == $0.key).isNotEmpty(db)
+                }
+        }
+        .defaulting(to: details.expirationInfo)
+        
         guard expirationInfo.count > 0 else {
             success(job, false)
             return