diff --git a/configuration.h b/configuration.h
index 65c0f8f8df..3612a07615 100644
--- a/configuration.h
+++ b/configuration.h
@@ -273,7 +273,7 @@ typedef struct settings
       int pid[MAX_USERS];
 
       unsigned libretro_device[MAX_USERS];
-      enum analog_dpad_mode analog_dpad_mode[MAX_USERS];
+      unsigned analog_dpad_mode[MAX_USERS];
 
       bool remap_binds_enable;
       float axis_threshold;
diff --git a/input/input_driver.c b/input/input_driver.c
index 0f93deab78..f3c157daa6 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -510,7 +510,7 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
    {
       struct retro_keybind *general_binds = settings->input.binds[i];
       struct retro_keybind *auto_binds    = settings->input.autoconf_binds[i];
-      enum analog_dpad_mode dpad_mode     = settings->input.analog_dpad_mode[i];
+      enum analog_dpad_mode dpad_mode     = (enum analog_dpad_mode)settings->input.analog_dpad_mode[i];
 
       if (dpad_mode == ANALOG_DPAD_NONE)
          continue;
diff --git a/runloop.c b/runloop.c
index 10b3642ad6..e2627fedf0 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1177,7 +1177,7 @@ int runloop_iterate(unsigned *sleep_ms)
    {
       struct retro_keybind *general_binds = settings->input.binds[i];
       struct retro_keybind *auto_binds    = settings->input.autoconf_binds[i];
-      enum analog_dpad_mode dpad_mode     = settings->input.analog_dpad_mode[i];
+      enum analog_dpad_mode dpad_mode     = (enum analog_dpad_mode)settings->input.analog_dpad_mode[i];
 
       if (dpad_mode == ANALOG_DPAD_NONE)
          continue;
@@ -1201,7 +1201,7 @@ int runloop_iterate(unsigned *sleep_ms)
    {
       struct retro_keybind *general_binds = settings->input.binds[i];
       struct retro_keybind *auto_binds    = settings->input.autoconf_binds[i];
-      enum analog_dpad_mode dpad_mode     = settings->input.analog_dpad_mode[i];
+      enum analog_dpad_mode dpad_mode     = (enum analog_dpad_mode)settings->input.analog_dpad_mode[i];
 
       if (dpad_mode == ANALOG_DPAD_NONE)
          continue;