diff --git a/Session/Conversations/Settings/ThreadSettingsViewModel.swift b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
index 486644d3c..2a1592866 100644
--- a/Session/Conversations/Settings/ThreadSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
@@ -201,7 +201,12 @@ class ThreadSettingsViewModel: SessionTableViewModel<ThreadSettingsViewModel.Nav
                 .conversationSettingsQuery(threadId: threadId, userPublicKey: userPublicKey)
                 .fetchOne(db)
             
-            guard let threadViewModel: SessionThreadViewModel = maybeThreadViewModel else { return [] }
+            // If we don't get a `SessionThreadViewModel` then it means the thread was probably deleted
+            // so dismiss the screen
+            guard let threadViewModel: SessionThreadViewModel = maybeThreadViewModel else {
+                self?.dismissScreen(type: .popToRoot)
+                return []
+            }
             
             // Additional Queries
             let fallbackSound: Preferences.Sound = db[.defaultNotificationSound]
diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
index 860df5069..ae9b3a53d 100644
--- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift	
@@ -549,7 +549,7 @@ extension MessageReceiver {
                     try ClosedGroup.removeKeysAndUnsubscribe(
                         db,
                         threadId: threadId,
-                        removeGroupData: false,
+                        removeGroupData: (sender == userPublicKey),
                         calledFromConfigHandling: false
                     )
                 }
diff --git a/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift b/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift
index c4465cdeb..04e0d6713 100644
--- a/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift	
+++ b/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift	
@@ -89,9 +89,6 @@ internal extension SessionUtil {
         let userPublicKey: String = getUserHexEncodedPublicKey(db)
         let targetContactData: ContactData = contactData.filter { $0.key != userPublicKey }
         
-        // If we only updated the current user contact then no need to continue
-        guard !targetContactData.isEmpty else { return }
-        
         // Since we don't sync 100% of the data stored against the contact and profile objects we
         // need to only update the data we do have to ensure we don't overwrite anything that doesn't
         // get synced
diff --git a/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift b/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift
index ff4fb4eac..c114816f2 100644
--- a/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift	
+++ b/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+ConvoInfoVolatile.swift	
@@ -85,9 +85,6 @@ internal extension SessionUtil {
             convo_info_volatile_iterator_advance(convoIterator)
         }
         convo_info_volatile_iterator_free(convoIterator) // Need to free the iterator
-
-        // If we don't have any conversations then no need to continue
-        guard !volatileThreadInfo.isEmpty else { return }
         
         // Get the local volatile thread info from all conversations
         let localVolatileThreadInfo: [String: VolatileThreadInfo] = VolatileThreadInfo.fetchAll(db)
diff --git a/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserGroups.swift b/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserGroups.swift
index 2958b133c..0ba663d29 100644
--- a/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserGroups.swift	
+++ b/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+UserGroups.swift	
@@ -119,9 +119,6 @@ internal extension SessionUtil {
         }
         user_groups_iterator_free(groupsIterator) // Need to free the iterator
         
-        // If we don't have any conversations then no need to continue
-        guard !communities.isEmpty || !legacyGroups.isEmpty else { return }
-        
         // Extract all community/legacyGroup/group thread priorities
         let existingThreadInfo: [String: PriorityVisibilityInfo] = (try? SessionThread
             .select(.id, .variant, .pinnedPriority, .shouldBeVisible)
diff --git a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
index 91d1296e5..8d83302f7 100644
--- a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift	
+++ b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift	
@@ -255,6 +255,8 @@ public struct SessionThreadViewModel: FetchableRecordWithRowId, Decodable, Equat
         let threadId: String = self.threadId
         let threadWasMarkedUnread: Bool? = self.threadWasMarkedUnread
         let markThreadAsReadIfNeeded: () -> () = {
+            // Only make this change if needed (want to avoid triggering a thread update
+            // if not needed)
             guard threadWasMarkedUnread == true else { return }
             
             Storage.shared.writeAsync { db in
@@ -289,16 +291,7 @@ public struct SessionThreadViewModel: FetchableRecordWithRowId, Decodable, Equat
                 let threadIsMessageRequest: Bool? = self.threadIsMessageRequest
                 
                 Storage.shared.writeAsync { db in
-                    // Only make this change if needed (want to avoid triggering a thread update
-                    // if not needed)
-                    if threadWasMarkedUnread == true {
-                        try SessionThread
-                            .filter(id: threadId)
-                            .updateAllAndConfig(
-                                db,
-                                SessionThread.Columns.markedAsUnread.set(to: false)
-                            )
-                    }
+                    markThreadAsReadIfNeeded()
                     
                     try Interaction.markAsRead(
                         db,