diff --git a/input/input_autodetect.c b/input/input_autodetect.c
index b3e7211ba7..56192916d6 100644
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@@ -305,13 +305,14 @@ bool input_config_autoconfigure_joypad(autoconfig_params_t *params)
    if (!*params->name)
       return ret;
 
-#if defined(HAVE_BUILTIN_AUTOCONFIG)
-   ret = input_autoconfigure_joypad_from_conf_internal(params);
-#endif
-
    if (!ret)
       ret = input_autoconfigure_joypad_from_conf_dir(params);
 
+#if defined(HAVE_BUILTIN_AUTOCONFIG)
+   if (!ret)
+      ret = input_autoconfigure_joypad_from_conf_internal(params);
+#endif
+
    return ret;
 }