diff --git a/submodules/ComposePollUI/Sources/ComposePollScreen.swift b/submodules/ComposePollUI/Sources/ComposePollScreen.swift
index 0a46669f78..e7a314753c 100644
--- a/submodules/ComposePollUI/Sources/ComposePollScreen.swift
+++ b/submodules/ComposePollUI/Sources/ComposePollScreen.swift
@@ -1403,7 +1403,7 @@ final class ComposePollScreenComponent: Component {
                 }
             }
             
-            if previousEditingTag !== self.currentEditingTag, self.currentInputMode != .keyboard {
+            if let currentEditingTag = self.currentEditingTag, previousEditingTag !== currentEditingTag, self.currentInputMode != .keyboard {
                 DispatchQueue.main.async { [weak self] in
                     guard let self else {
                         return