diff --git a/SessionMessagingKit/Open Groups/OpenGroupManager.swift b/SessionMessagingKit/Open Groups/OpenGroupManager.swift
index 2d4890b1e..138fc9a89 100644
--- a/SessionMessagingKit/Open Groups/OpenGroupManager.swift	
+++ b/SessionMessagingKit/Open Groups/OpenGroupManager.swift	
@@ -781,9 +781,7 @@ public final class OpenGroupManager {
                             let syncTarget: String = (lookup.sessionId ?? message.recipient)
                             
                             switch messageInfo.variant {
-                                case .visibleMessage:
-                                    (messageInfo.message as? VisibleMessage)?.syncTarget = syncTarget
-                                    
+                                case .visibleMessage: (messageInfo.message as? VisibleMessage)?.syncTarget = syncTarget
                                 default: break
                             }
                         }
diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
index 39a68e754..c77008f65 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
@@ -95,7 +95,6 @@ public enum MessageReceiver {
                         threadIdGenerator = { message in
                             switch message {
                                 case let message as VisibleMessage: return (message.syncTarget ?? sender)
-                                case let message as ExpirationTimerUpdate: return (message.syncTarget ?? sender)
                                 default: return sender
                             }
                         }