diff --git a/emmy_debugger/src/debugger/emmy_debugger.cpp b/emmy_debugger/src/debugger/emmy_debugger.cpp
index 0b13a72..b6d76f6 100644
--- a/emmy_debugger/src/debugger/emmy_debugger.cpp
+++ b/emmy_debugger/src/debugger/emmy_debugger.cpp
@@ -660,7 +660,7 @@ void Debugger::EnterDebugMode() {
 		std::unique_lock<std::mutex> lockEval(evalMtx);
 		if (evalQueue.empty() && blocking) {
 			lockEval.unlock();
-			cvRun.wait(lock);
+			cvRun.wait(lock, [this] { return !blocking || !evalQueue.empty(); });
 			lockEval.lock();
 		}
 		if (!evalQueue.empty()) {