diff --git a/libgambatte/src/memory.cpp b/libgambatte/src/memory.cpp
index 66b4c6c5a2..0c231426cb 100644
--- a/libgambatte/src/memory.cpp
+++ b/libgambatte/src/memory.cpp
@@ -322,11 +322,14 @@ unsigned long Memory::stop(unsigned long cycleCounter) {
 			intreq.setEventTime<END>(cycleCounter + (isDoubleSpeed() ?
 					(intreq.eventTime(END) - cycleCounter) << 1 : (intreq.eventTime(END) - cycleCounter) >> 1));
 		}
+		// when switching speed, it seems that the CPU spontaneously restarts soon?
+		// otherwise, the cpu should be allowed to stay halted as long as needed
+		// so only execute this line when switching speed
+		intreq.setEventTime<UNHALT>(cycleCounter + 0x20000 + isDoubleSpeed() * 8);
 	}
 	
 	intreq.halt();
-	intreq.setEventTime<UNHALT>(cycleCounter + 0x20000 + isDoubleSpeed() * 8);
-	
+
 	return cycleCounter;
 }
 
diff --git a/output/dll/libgambatte.dll b/output/dll/libgambatte.dll
index 68495d184d..d523ae44dd 100644
Binary files a/output/dll/libgambatte.dll and b/output/dll/libgambatte.dll differ