diff --git a/Core/System.cpp b/Core/System.cpp
index f135fa3487..13a6a2d459 100644
--- a/Core/System.cpp
+++ b/Core/System.cpp
@@ -112,7 +112,7 @@ bool CPU_HasPendingAction() {
 void CPU_WaitStatus(bool (*pred)()) {
 	cpuThreadLock.lock();
 	while (!pred())
-		cpuThreadCond.wait(cpuThreadLock);
+		cpuThreadCond.wait_for(cpuThreadLock, 16);
 	cpuThreadLock.unlock();
 }