diff --git a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
index 5299ec58b..8cafd4535 100644
--- a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift	
+++ b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift	
@@ -952,13 +952,13 @@ public extension SessionThreadViewModel {
                 (
                     SELECT \(contactProfile[.id])
                     FROM \(contactProfile.self)
-                    JOIN \(contact.self) ON \(contactProfile[.id]) = \(contact[.id])
-                    JOIN \(groupMember.self) ON (
-                        \(groupMember[.groupId]) = \(threadId) AND
-                        \(groupMember[.profileId]) = \(contactProfile[.id]) OR
-                        \(contact[.id]) = \(threadId)
+                    LEFT JOIN \(contact.self) ON \(contactProfile[.id]) = \(contact[.id])
+                    LEFT JOIN \(groupMember.self) ON \(groupMember[.groupId]) = \(threadId)
+                    WHERE (
+                        (\(groupMember[.profileId]) = \(contactProfile[.id]) OR
+                        \(contact[.id]) = \(threadId)) AND
+                        \(contact[.lastKnownClientVersion]) = \(FeatureVersion.legacyDisappearingMessages)
                     )
-                    WHERE \(contact[.lastKnownClientVersion]) = \(FeatureVersion.legacyDisappearingMessages)
                 ) AS \(ViewModel.Columns.outdatedMemberId),
                 (
                     \(SQL("\(thread[.variant]) = \(SessionThread.Variant.contact)")) AND