diff --git a/core/emulator.cpp b/core/emulator.cpp
index 22cd26a53..0bf549bf6 100644
--- a/core/emulator.cpp
+++ b/core/emulator.cpp
@@ -842,16 +842,18 @@ bool Emulator::checkStatus()
 
 bool Emulator::render()
 {
-	if (state != Running)
-		return false;
 	if (!config::ThreadedRendering)
 	{
+		if (state != Running)
+			return false;
 		run();
 		// TODO if stopping due to a user request, no frame has been rendered
 		return !renderTimeout;
 	}
 	if (!checkStatus())
 		return false;
+	if (state != Running)
+		return false;
 	return rend_single_frame(true); // FIXME stop flag?
 }