diff --git a/map/render_queue.cpp b/map/render_queue.cpp
index eca70469fa..def099d14c 100644
--- a/map/render_queue.cpp
+++ b/map/render_queue.cpp
@@ -115,7 +115,8 @@ ThreadedList<shared_ptr<RenderQueueRoutine::Command > > & RenderQueue::RenderCom
 void RenderQueue::WaitForEmptyAndFinished()
 {
   threads::ConditionGuard g(m_emptyAndFinished);
-  m_emptyAndFinished.Wait();
+  if (m_activeCommands != 0)
+    m_emptyAndFinished.Wait();
 }
 
 void RenderQueue::FinishCommand()