diff --git a/src/pipecat/transports/services/daily.py b/src/pipecat/transports/services/daily.py
index 7c124e376..7c537bd53 100644
--- a/src/pipecat/transports/services/daily.py
+++ b/src/pipecat/transports/services/daily.py
@@ -740,13 +740,17 @@ class DailyOutputTransport(BaseOutputTransport):
             self._messages_task.cancel()
             await self._messages_task
             self._messages_task = None
-        self._messages_task = None
         # Leave the room.
         await self._client.leave()
 
     async def cancel(self, frame: CancelFrame):
         # Parent stop.
         await super().cancel(frame)
+        # Cancel messages task
+        if self._messages_task:
+            self._messages_task.cancel()
+            await self._messages_task
+            self._messages_task = None
         # Leave the room.
         await self._client.leave()