diff --git a/host/RendererImpl.cpp b/host/RendererImpl.cpp
index bd224ef..c1fb7dd 100644
--- a/host/RendererImpl.cpp
+++ b/host/RendererImpl.cpp
@@ -184,6 +184,7 @@
     for (const auto& c : mStoppedChannels) {
         c->renderThread()->wait();
     }
+    mCleanupThread->waitForCleanup();
     mStoppedChannels.clear();
 }