diff --git a/submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift b/submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift
index ac6cdb6fc3..24f62db616 100644
--- a/submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift
+++ b/submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift
@@ -3286,6 +3286,8 @@ private func optimizedOperations(_ operations: [AccountStateMutationOperation])
                     result.append(.AddQuickReplyMessages(currentAddQuickReplyMessages.messages))
                 }
                 currentAddMessages = nil
+                currentAddScheduledMessages = nil
+                currentAddQuickReplyMessages = nil
                 result.append(operation)
             case let .UpdateState(state):
                 updatedState = state