diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
index 8870aaac83..6d2a2723ff 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
@@ -180,7 +180,7 @@ void VideoSoftware::Video_EnterLoop()
 
 		if (!emuRunningState)
 		{
-			while (!emuRunningState)
+			while (!emuRunningState && fifoStateRun)
 			{
 				g_video_backend->PeekMessages();
 				Common::SleepCurrentThread(1);