diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index 5da349b32b..4f8ac88943 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -843,12 +843,8 @@ static void input_autoconfigure_connect_handler(retro_task_t *task)
    if (!params || string_is_empty(params->name))
       goto end;
 
-#ifndef HAVE_LIBNX // This seems to be problematic on switch with threading
    if (     !input_autoconfigure_joypad_from_conf_dir(params, task)
          && !input_autoconfigure_joypad_from_conf_internal(params, task))
-#else
-   if ( !input_autoconfigure_joypad_from_conf_internal(params, task))
-#endif
    {
       char msg[255];