diff --git a/frontend/frontend.c b/frontend/frontend.c
index 3c02ab9dc4..65a234e8ac 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -252,10 +252,9 @@ returntype main_entry(signature())
       }
    }
 
-   rarch_main_command(RARCH_CMD_HISTORY_INIT);
-
    if (g_settings.history_list_enable)
    {
+      rarch_main_command(RARCH_CMD_HISTORY_INIT);
       if (g_extern.content_is_init || g_extern.system.no_content)
          history_playlist_push(g_defaults.history,
                g_extern.fullpath,
diff --git a/retroarch.c b/retroarch.c
index 0892517645..a6304ab012 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2413,6 +2413,8 @@ bool rarch_main_command(unsigned cmd)
          break;
       case RARCH_CMD_HISTORY_INIT:
          rarch_main_command(RARCH_CMD_HISTORY_DEINIT);
+         if (!g_settings.history_list_enable)
+            return false;
          g_defaults.history = content_playlist_init(
                g_settings.content_history_path,
                g_settings.content_history_size);