diff --git a/submodules/TelegramUI/Sources/ChatMessagePollBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessagePollBubbleContentNode.swift
index fd6d151c9a..c8ef9cb01f 100644
--- a/submodules/TelegramUI/Sources/ChatMessagePollBubbleContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessagePollBubbleContentNode.swift
@@ -1440,7 +1440,7 @@ class ChatMessagePollBubbleContentNode: ChatMessageBubbleContentNode {
                                         guard let strongSelf = self, let item = strongSelf.item else {
                                             return
                                         }
-                                        item.controllerInteraction.requestMessageUpdate(item.message.id)
+                                        //item.controllerInteraction.requestMessageUpdate(item.message.id)
                                     }
                                     
                                     let timerTransition: ContainedViewLayoutTransition
diff --git a/submodules/TelegramUI/Sources/PollBubbleTimerNode.swift b/submodules/TelegramUI/Sources/PollBubbleTimerNode.swift
index fec6619852..6d59a76864 100644
--- a/submodules/TelegramUI/Sources/PollBubbleTimerNode.swift
+++ b/submodules/TelegramUI/Sources/PollBubbleTimerNode.swift
@@ -110,7 +110,7 @@ final class PollBubbleTimerNode: ASDisplayNode {
         
         if let deadlineTimestamp = params.deadlineTimestamp {
             let fractionalTimestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970
-            fractionalTimeout = max(0.0, Double(deadlineTimestamp) - fractionalTimestamp)
+            fractionalTimeout = min(Double(params.timeout), max(0.0, Double(deadlineTimestamp) + 1.0 - fractionalTimestamp))
         } else {
             fractionalTimeout = Double(params.timeout)
         }