diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index 66c14426ee..416c07b850 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -306,6 +306,7 @@ static void input_autoconfigure_connect_handler(retro_task_t *task)
 
    if (!params || !input_autoconfigure_joypad_init(params) || string_is_empty(params->name))
    {
+      free(params);
       task->finished = true;
       return;
    }
@@ -324,11 +325,6 @@ static void input_autoconfigure_connect_handler(retro_task_t *task)
             params->name, (long)params->vid, (long)params->pid,
             msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED));
       task->title = strdup(msg);
-
-      free(params);
-
-      task->finished = true;
-      return;
    }
 
    free(params);