diff --git a/limelight-common/AudioStream.c b/limelight-common/AudioStream.c
index 4aca21b..30ae434 100644
--- a/limelight-common/AudioStream.c
+++ b/limelight-common/AudioStream.c
@@ -49,8 +49,6 @@ static void freePacketList(PLINKED_BLOCKING_QUEUE_ENTRY entry) {
 
 /* Tear down the audio stream once we're done with it */
 void destroyAudioStream(void) {
-	AudioCallbacks.cleanup();
-
 	freePacketList(LbqDestroyLinkedBlockingQueue(&packetQueue));
 	RtpqCleanupQueue(&rtpReorderQueue);
 }
@@ -191,6 +189,8 @@ static void DecoderThreadProc(void* context) {
 }
 
 void stopAudioStream(void) {
+    AudioCallbacks.cleanup();
+
 	PltInterruptThread(&udpPingThread);
 	PltInterruptThread(&receiveThread);
 	PltInterruptThread(&decoderThread);
diff --git a/limelight-common/VideoStream.c b/limelight-common/VideoStream.c
index d7adadf..0c9af3a 100644
--- a/limelight-common/VideoStream.c
+++ b/limelight-common/VideoStream.c
@@ -31,8 +31,6 @@ void initializeVideoStream(void) {
 
 /* Clean up the video stream */
 void destroyVideoStream(void) {
-	VideoCallbacks.cleanup();
-
 	destroyVideoDepacketizer();
 	RtpqCleanupQueue(&rtpQueue);
 }
@@ -150,6 +148,8 @@ int readFirstFrame(void) {
 
 /* Terminate the video stream */
 void stopVideoStream(void) {
+    VideoCallbacks.cleanup();
+
 	PltInterruptThread(&udpPingThread);
 	PltInterruptThread(&receiveThread);
 	PltInterruptThread(&decoderThread);