diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5ab2475d..e1220a3aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to **pipecat** will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- Fixed `DailyInputTransport` and `DailyOutputTransport` stop/cleanup ordering.
+
 ## [0.0.13] - 2024-05-14
 
 ### Changed
diff --git a/src/pipecat/transports/services/daily.py b/src/pipecat/transports/services/daily.py
index df899cc50..a7850c2fc 100644
--- a/src/pipecat/transports/services/daily.py
+++ b/src/pipecat/transports/services/daily.py
@@ -421,13 +421,13 @@ async def start(self):
         await self._session.join()
 
     async def stop(self):
-        await super().stop()
         await self._session.leave()
+        await super().stop()
 
     async def cleanup(self):
-        await super().cleanup()
         self._camera_in_thread.join()
         await self._session.cleanup()
+        await super().cleanup()
 
     def vad_analyze(self, audio_frames: bytes) -> VADState:
         return self._session.vad_analyze(audio_frames)
@@ -522,12 +522,12 @@ async def start(self):
         await self._session.join()
 
     async def stop(self):
-        await super().stop()
         await self._session.leave()
+        await super().stop()
 
     async def cleanup(self):
-        await super().cleanup()
         await self._session.cleanup()
+        await super().cleanup()
 
     def write_raw_audio_frames(self, frames: bytes):
         self._session.write_raw_audio_frames(frames)