diff --git a/submodules/Postbox/Sources/MessageHistoryMetadataTable.swift b/submodules/Postbox/Sources/MessageHistoryMetadataTable.swift
index f06f29b571..1e2517bb89 100644
--- a/submodules/Postbox/Sources/MessageHistoryMetadataTable.swift
+++ b/submodules/Postbox/Sources/MessageHistoryMetadataTable.swift
@@ -81,6 +81,7 @@ final class MessageHistoryMetadataTable: Table {
     private func peerThreadHoleIndexInitializedKey(peerId: PeerId, threadId: Int64) -> ValueBoxKey {
         self.sharedPeerThreadHoleIndexInitializedKey.setInt64(0, value: peerId.toInt64())
         self.sharedPeerThreadHoleIndexInitializedKey.setInt8(8, value: MetadataPrefix.PeerHistoryThreadHoleIndexInitialized.rawValue)
+        self.sharedPeerThreadHoleIndexInitializedKey.setInt64(0, value: threadId)
         return self.sharedPeerThreadHoleIndexInitializedKey
     }
     
diff --git a/submodules/Postbox/Sources/MessageHistoryThreadHoleIndexTable.swift b/submodules/Postbox/Sources/MessageHistoryThreadHoleIndexTable.swift
index d973c85cb8..58987f71b7 100644
--- a/submodules/Postbox/Sources/MessageHistoryThreadHoleIndexTable.swift
+++ b/submodules/Postbox/Sources/MessageHistoryThreadHoleIndexTable.swift
@@ -110,6 +110,7 @@ final class MessageHistoryThreadHoleIndexTable: Table {
     
     private func ensureInitialized(peerId: PeerId, threadId: Int64) {
         if !self.metadataTable.isThreadHoleIndexInitialized(peerId: peerId, threadId: threadId) {
+            postboxLog("MessageHistoryThreadHoleIndexTable: Initializing \(peerId) \(threadId)")
             self.metadataTable.setIsThreadHoleIndexInitialized(peerId: peerId, threadId: threadId)
             
             if let messageNamespaces = self.seedConfiguration.messageThreadHoles[peerId.namespace] {