diff --git a/SessionMessagingKit/Database/Models/Interaction.swift b/SessionMessagingKit/Database/Models/Interaction.swift
index 8a13afb04..11eed2dff 100644
--- a/SessionMessagingKit/Database/Models/Interaction.swift
+++ b/SessionMessagingKit/Database/Models/Interaction.swift
@@ -812,6 +812,19 @@ public extension Interaction {
         }
     }
     
+    struct ThreadInfo: FetchableRecord, Codable {
+        public let id: Int64
+        public let threadId: String
+        
+        public init(
+            id: Int64,
+            threadId: String
+        ) {
+            self.id = id
+            self.threadId = threadId
+        }
+    }
+    
     static func idsForTermWithin(threadId: String, pattern: FTS5Pattern) -> SQLRequest<TimestampInfo> {
         let interaction: TypedTableAlias<Interaction> = TypedTableAlias()
         let interactionFullTextSearch: TypedTableAlias<FullTextSearch> = TypedTableAlias(name: Interaction.fullTextSearchTableName)
diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+UnsendRequests.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+UnsendRequests.swift
index e1f954627..44cfb7908 100644
--- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+UnsendRequests.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+UnsendRequests.swift	
@@ -35,11 +35,11 @@ extension MessageReceiver {
         guard
             let author: String = message.author,
             let timestampMs: UInt64 = message.timestamp,
-            let interactionId: Int64 = try Interaction
-                .select(.id)
+            let interactionInfo: Interaction.ThreadInfo = try Interaction
+                .select(.id, .threadId)
                 .filter(Interaction.Columns.timestampMs == Int64(timestampMs))
                 .filter(Interaction.Columns.authorId == author)
-                .asRequest(of: Int64.self)
+                .asRequest(of: Interaction.ThreadInfo.self)
                 .fetchOne(db)
         else { return }
         
@@ -48,20 +48,20 @@ extension MessageReceiver {
         /// message content
         let hashes: Set<String> = try Interaction.serverHashesForDeletion(
             db,
-            interactionIds: [interactionId]
+            interactionIds: [interactionInfo.id]
         )
         try Interaction.markAsDeleted(
             db,
             threadId: threadId,
             threadVariant: threadVariant,
-            interactionIds: [interactionId],
+            interactionIds: [interactionInfo.id],
             localOnly: false,
             using: dependencies
         )
         
         /// If it's the `Note to Self` conversation then we want to just delete the interaction
-        if userSessionId.hexString == threadId {
-            try Interaction.deleteOne(db, id: interactionId)
+        if userSessionId.hexString == interactionInfo.threadId {
+            try Interaction.deleteOne(db, id: interactionInfo.id)
         }
         
         /// Can't delete from the legacy group swarm so only bother for contact conversations