diff --git a/retroarch.c b/retroarch.c
index 250597db17..e9742d6969 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -4086,7 +4086,7 @@ bool command_event(enum event_command cmd, void *data)
 
             command_event(CMD_EVENT_HISTORY_DEINIT, NULL);
 
-            if (!history_list_enable)
+            if (!history_list_enable || !playlist_config.capacity)
                return false;
 
             _msg = msg_hash_to_str(MSG_LOADING_HISTORY_FILE);
@@ -8319,6 +8319,9 @@ void retroarch_favorites_init(void)
 
    retroarch_favorites_deinit();
 
+   if (!playlist_config.capacity)
+      return;
+
    RARCH_LOG("[Playlist]: %s: \"%s\".\n",
          msg_hash_to_str(MSG_LOADING_FAVORITES_FILE),
          path_content_favorites);