diff --git a/Core/AutomaticRomTest.cpp b/Core/AutomaticRomTest.cpp
index 2f1c60e6..1a1d2fd0 100644
--- a/Core/AutomaticRomTest.cpp
+++ b/Core/AutomaticRomTest.cpp
@@ -108,11 +108,11 @@ void AutomaticRomTest::ProcessNotification(ConsoleNotificationType type, void* p
 
 int32_t AutomaticRomTest::Run(string filename)
 {
-	EmulationSettings::SetFlags(EmulationFlags::ForceMaxSpeed);
 	EmulationSettings::SetMasterVolume(0);
 	Console::Pause();
 	if(Console::LoadROM(filename)) {
 		Console::Resume();
+		EmulationSettings::SetFlags(EmulationFlags::ForceMaxSpeed);
 		EmulationSettings::ClearFlags(EmulationFlags::Paused);
 		_signal.Wait();
 
diff --git a/Core/Console.cpp b/Core/Console.cpp
index 39bebcb0..a0b9699e 100644
--- a/Core/Console.cpp
+++ b/Core/Console.cpp
@@ -200,6 +200,7 @@ bool Console::Initialize(VirtualFile &romFile, VirtualFile &patchFile)
 			if(EmulationSettings::GetOverclockRate() != 100) {
 				MessageManager::DisplayMessage("ClockRate", std::to_string(EmulationSettings::GetOverclockRate()) + "%");
 			}
+			EmulationSettings::ClearFlags(EmulationFlags::ForceMaxSpeed);
 			return true;
 		}
 	}
@@ -553,6 +554,7 @@ void Console::Run()
 	VideoDecoder::GetInstance()->StopThread();
 
 	EmulationSettings::ClearFlags(EmulationFlags::Paused);
+	EmulationSettings::ClearFlags(EmulationFlags::ForceMaxSpeed);
 
 	_initialized = false;
 
diff --git a/Core/RecordedRomTest.cpp b/Core/RecordedRomTest.cpp
index af6f7a14..be319410 100644
--- a/Core/RecordedRomTest.cpp
+++ b/Core/RecordedRomTest.cpp
@@ -212,7 +212,6 @@ int32_t RecordedRomTest::Run(string filename)
 			return false;
 		}
 
-		EmulationSettings::SetFlags(EmulationFlags::ForceMaxSpeed);
 		EmulationSettings::SetMasterVolume(0);
 		
 		Console::Pause();
@@ -237,6 +236,7 @@ int32_t RecordedRomTest::Run(string filename)
 
 		//Start playing movie
 		if(Console::LoadROM(testRom)) {
+			EmulationSettings::SetFlags(EmulationFlags::ForceMaxSpeed);
 			_runningTest = true;
 			MovieManager::Play(testMovie);