diff --git a/src/core/analog_controller.cpp b/src/core/analog_controller.cpp
index e9acaf307..5b4754253 100644
--- a/src/core/analog_controller.cpp
+++ b/src/core/analog_controller.cpp
@@ -30,7 +30,7 @@ void AnalogController::Reset()
 
   ResetRumbleConfig();
 
-  if (m_auto_enable_analog)
+  if (m_force_analog_on_reset)
     SetAnalogMode(true);
 }
 
@@ -679,8 +679,9 @@ u32 AnalogController::StaticGetVibrationMotorCount()
 Controller::SettingList AnalogController::StaticGetSettings()
 {
   static constexpr std::array<SettingInfo, 4> settings = {
-    {{SettingInfo::Type::Boolean, "AutoEnableAnalog", TRANSLATABLE("AnalogController", "Enable Analog Mode on Reset"),
-      TRANSLATABLE("AnalogController", "Automatically enables analog mode when the console is reset/powered on."),
+    {{SettingInfo::Type::Boolean, "ForceAnalogOnReset", TRANSLATABLE("AnalogController", "Force Analog Mode on Reset"),
+      TRANSLATABLE("AnalogController", "Forces the controller to analog mode when the console is reset/powered on. May "
+                                       "cause issues with games, so it is recommended to leave this option off."),
       "false"},
      {SettingInfo::Type::Boolean, "AnalogDPadInDigitalMode",
       TRANSLATABLE("AnalogController", "Use Analog Sticks for D-Pad in Digital Mode"),
@@ -704,7 +705,7 @@ Controller::SettingList AnalogController::StaticGetSettings()
 void AnalogController::LoadSettings(const char* section)
 {
   Controller::LoadSettings(section);
-  m_auto_enable_analog = g_host_interface->GetBoolSettingValue(section, "AutoEnableAnalog", false);
+  m_force_analog_on_reset = g_host_interface->GetBoolSettingValue(section, "ForceAnalogOnReset", false);
   m_analog_dpad_in_digital_mode = g_host_interface->GetBoolSettingValue(section, "AnalogDPadInDigitalMode", false);
   m_axis_scale =
     std::clamp(std::abs(g_host_interface->GetFloatSettingValue(section, "AxisScale", 1.00f)), 0.01f, 1.50f);
diff --git a/src/core/analog_controller.h b/src/core/analog_controller.h
index 5bae9fa06..f7fe9a8e6 100644
--- a/src/core/analog_controller.h
+++ b/src/core/analog_controller.h
@@ -144,7 +144,7 @@ private:
 
   u32 m_index;
 
-  bool m_auto_enable_analog = false;
+  bool m_force_analog_on_reset = false;
   bool m_analog_dpad_in_digital_mode = false;
   float m_axis_scale = 1.00f;
   u8 m_rumble_bias = 8;
diff --git a/src/duckstation-libretro/libretro_host_interface.cpp b/src/duckstation-libretro/libretro_host_interface.cpp
index 3525cb378..e6f850885 100644
--- a/src/duckstation-libretro/libretro_host_interface.cpp
+++ b/src/duckstation-libretro/libretro_host_interface.cpp
@@ -753,9 +753,10 @@ static std::array<retro_core_option_definition, 49> s_option_definitions = {{
     {"PlayStationMouse", "PlayStation Mouse"},
     {"NeGcon", "NeGcon"}},
    "DigitalController"},
-  {"duckstation_Controller1.AutoEnableAnalog",
-   "Controller 1 Auto Analog Mode",
-   "Automatically enables analog mode in supported controllers at start/reset.",
+  {"duckstation_Controller1.ForceAnalogOnReset",
+   "Controller 1 Force Analog Mode on Reset",
+   "Forces analog mode in Analog Controller (DualShock) at start/reset. May cause issues with some games. Only use "
+   "this option for games that support analog mode but do not automatically enable it themselves.",
    {{"true", "Enabled"}, {"false", "Disabled"}},
    "false"},
   {"duckstation_Controller1.AnalogDPadInDigitalMode",
@@ -778,9 +779,10 @@ static std::array<retro_core_option_definition, 49> s_option_definitions = {{
     {"PlayStationMouse", "PlayStation Mouse"},
     {"NeGcon", "NeGcon"}},
    "None"},
-  {"duckstation_Controller2.AutoEnableAnalog",
-   "Controller 2 Auto Analog Mode",
-   "Automatically enables analog mode in supported controllers at start/reset.",
+  {"duckstation_Controller2.ForceAnalogOnReset",
+   "Controller 2 Force Analog Mode on Reset",
+   "Forces analog mode in Analog Controller (DualShock) at start/reset. May cause issues with some games. Only use "
+   "this option for games that support analog mode but do not automatically enable it themselves.",
    {{"true", "Enabled"}, {"false", "Disabled"}},
    "false"},
   {"duckstation_Controller2.AnalogDPadInDigitalMode",