diff --git a/gateway/stream_consumer.py b/gateway/stream_consumer.py
index 53434da3c4..c236dc69a6 100644
--- a/gateway/stream_consumer.py
+++ b/gateway/stream_consumer.py
@@ -1311,6 +1311,22 @@ class GatewayStreamConsumer:
                         self._flood_strikes = 0
                         return True
                     else:
+                        if (
+                            finalize
+                            and is_turn_final
+                            and self.cfg.cursor
+                            and self._last_sent_text.endswith(self.cfg.cursor)
+                            and self._visible_prefix() == text
+                        ):
+                            # The final clean-up edit failed, but the complete
+                            # answer is already visible from the last streaming
+                            # frame (usually with only the cursor still stuck on
+                            # screen).  Mark the content delivered so the
+                            # gateway suppresses its normal full final send;
+                            # otherwise users see the same long answer twice
+                            # when Telegram/Discord rate-limit this cosmetic
+                            # final edit (#36965, #25349).
+                            self._final_content_delivered = True
                         raw_response = getattr(result, "raw_response", None)
                         if isinstance(raw_response, dict) and raw_response.get("partial_overflow"):
                             # Telegram edited/sent one or more overflow chunks,
diff --git a/tests/gateway/test_stream_consumer_fresh_final.py b/tests/gateway/test_stream_consumer_fresh_final.py
index 975c0ada59..82e9de1f32 100644
--- a/tests/gateway/test_stream_consumer_fresh_final.py
+++ b/tests/gateway/test_stream_consumer_fresh_final.py
@@ -541,6 +541,67 @@ class TestGotDoneOverflowSplitNotRefinalized:
         assert consumer.final_response_sent is True
 
 
+class TestFinalCleanupEditFloodControl:
+    """Regression for duplicate final sends when the cursor-strip edit fails."""
+
+    @pytest.mark.asyncio
+    async def test_failed_final_cleanup_edit_marks_visible_content_delivered(self):
+        adapter = _make_adapter()
+        adapter.edit_message = AsyncMock(return_value=SimpleNamespace(
+            success=False,
+            error="Flood control exceeded. Retry in 12 seconds",
+        ))
+        consumer = GatewayStreamConsumer(
+            adapter=adapter,
+            chat_id="chat",
+            config=StreamConsumerConfig(
+                edit_interval=0.01, buffer_threshold=5, cursor=" ▉",
+            ),
+        )
+
+        final_text = "The complete answer is already visible before cleanup."
+        consumer.on_delta(final_text)
+        task = asyncio.create_task(consumer.run())
+        await asyncio.sleep(0.05)  # streaming preview lands with cursor
+        assert consumer._last_sent_text == f"{final_text} ▉"
+
+        consumer.finish()
+        await task
+
+        # The final cosmetic edit failed, so final_response_sent stays false;
+        # the important signal is that content_delivered suppresses the
+        # gateway's normal full final send and prevents a duplicate answer.
+        assert consumer.final_response_sent is False
+        assert consumer.final_content_delivered is True
+        assert adapter.send.call_count == 1
+        assert adapter.edit_message.call_count >= 1
+
+    @pytest.mark.asyncio
+    async def test_failed_final_edit_does_not_mark_undelivered_tail(self):
+        adapter = _make_adapter()
+        adapter.edit_message = AsyncMock(return_value=SimpleNamespace(
+            success=False,
+            error="Flood control exceeded. Retry in 12 seconds",
+        ))
+        consumer = GatewayStreamConsumer(
+            adapter=adapter,
+            chat_id="chat",
+            config=StreamConsumerConfig(
+                edit_interval=10.0, buffer_threshold=10_000, cursor=" ▉",
+            ),
+        )
+        await consumer._send_or_edit("visible prefix ▉")
+
+        ok = await consumer._send_or_edit(
+            "visible prefix plus unsent tail",
+            finalize=True,
+        )
+
+        assert ok is False
+        assert consumer.final_response_sent is False
+        assert consumer.final_content_delivered is False
+
+
 class TestStreamConsumerConfigFreshFinalField:
     """The dataclass field must exist and default to 0 (disabled)."""