diff --git a/src/core/analog_controller.cpp b/src/core/analog_controller.cpp
index 93c1702b0..74c32b959 100644
--- a/src/core/analog_controller.cpp
+++ b/src/core/analog_controller.cpp
@@ -65,6 +65,8 @@ bool AnalogController::DoState(StateWrapper& sw, bool apply_input_state)
   sw.DoEx(&button_state, 44, static_cast<u16>(0xFFFF));
   if (apply_input_state)
     m_button_state = button_state;
+  else
+    m_analog_mode = old_analog_mode;
 
   sw.Do(&m_command);