diff --git a/Core/AutoSaveManager.cpp b/Core/AutoSaveManager.cpp
index 23631865..5ece94f8 100644
--- a/Core/AutoSaveManager.cpp
+++ b/Core/AutoSaveManager.cpp
@@ -14,7 +14,9 @@ AutoSaveManager::AutoSaveManager()
 			uint32_t autoSaveDelay = EmulationSettings::GetAutoSaveDelay(showMessage) * 60 * 1000;
 			if(autoSaveDelay > 0) {
 				if(_timer.GetElapsedMS() > autoSaveDelay) {
-					SaveStateManager::SaveState(_autoSaveSlot, showMessage);
+					if(!Console::IsDebuggerAttached()) {
+						SaveStateManager::SaveState(_autoSaveSlot, showMessage);
+					}
 					_timer.Reset();
 				}
 			} else {
diff --git a/Core/Console.cpp b/Core/Console.cpp
index 1edf86db..0a35ea1e 100644
--- a/Core/Console.cpp
+++ b/Core/Console.cpp
@@ -500,4 +500,9 @@ uint32_t Console::GetLagCounter()
 void Console::ResetLagCounter()
 {
 	Instance->_lagCounter = 0;
+}
+
+bool Console::IsDebuggerAttached()
+{
+	return (bool)Instance->_debugger;
 }
\ No newline at end of file
diff --git a/Core/Console.h b/Core/Console.h
index eb50d5b6..d3d02ecb 100644
--- a/Core/Console.h
+++ b/Core/Console.h
@@ -83,6 +83,8 @@ class Console
 
 		static bool IsRunning();
 
+		static bool IsDebuggerAttached();
+
 		static shared_ptr<Console> GetInstance();
 		static void Release();
 };