diff --git a/command.c b/command.c
index f6fbf16c75..ef15a962cb 100644
--- a/command.c
+++ b/command.c
@@ -2540,14 +2540,14 @@ TODO: Add a setting for these tweaks */
          command_event(CMD_EVENT_REMOTE_DEINIT, NULL);
          input_driver_init_remote();
          break;
+
       case CMD_EVENT_MAPPER_DEINIT:
          input_driver_deinit_mapper();
          break;
       case CMD_EVENT_MAPPER_INIT:
          command_event(CMD_EVENT_MAPPER_DEINIT, NULL);
-         if (!input_driver_init_mapper())
-            return false;
-         break;
+         input_driver_init_mapper();
+      break;
       case CMD_EVENT_LOG_FILE_DEINIT:
          retro_main_log_file_deinit();
          break;
diff --git a/retroarch.c b/retroarch.c
index 26a27dc40b..4158adbbca 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1302,9 +1302,9 @@ bool retroarch_main_init(int argc, char *argv[])
    drivers_init(DRIVERS_CMD_ALL);
    command_event(CMD_EVENT_COMMAND_INIT, NULL);
    command_event(CMD_EVENT_REMOTE_INIT, NULL);
+   command_event(CMD_EVENT_MAPPER_INIT, NULL);
    command_event(CMD_EVENT_REWIND_INIT, NULL);
    command_event(CMD_EVENT_CONTROLLERS_INIT, NULL);
-   command_event(CMD_EVENT_MAPPER_INIT, NULL);
    command_event(CMD_EVENT_RECORD_INIT, NULL);
    command_event(CMD_EVENT_CHEATS_INIT, NULL);