diff --git a/retroarch.c b/retroarch.c
index 7b8966a2bc..4d38e872f9 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3271,6 +3271,9 @@ bool rarch_main_iterate(void)
    /* Update binds for analog dpad modes. */
    for (i = 0; i < MAX_PLAYERS; i++)
    {
+      if (!g_settings.input.analog_dpad_mode[i])
+         continue;
+
       input_push_analog_dpad(g_settings.input.binds[i],
             g_settings.input.analog_dpad_mode[i]);
       input_push_analog_dpad(g_settings.input.autoconf_binds[i],
@@ -3291,6 +3294,9 @@ bool rarch_main_iterate(void)
 
    for (i = 0; i < MAX_PLAYERS; i++)
    {
+      if (!g_settings.input.analog_dpad_mode[i])
+         continue;
+
       input_pop_analog_dpad(g_settings.input.binds[i]);
       input_pop_analog_dpad(g_settings.input.autoconf_binds[i]);
    }