diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 6072a2d0e8..298e7ef9e8 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -2544,14 +2544,19 @@ static int action_ok_delete_entry(const char *path,
 
    menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist);
 
-   if (!strcmp(playlist->conf_path, g_defaults.music_history->conf_path))
+   if (!strcmp(playlist->conf_path, g_defaults.content_history->conf_path))
+      playlist = g_defaults.content_history;
+#ifdef HAVE_FFMPEG
+   else if (!strcmp(playlist->conf_path, g_defaults.music_history->conf_path))
       playlist = g_defaults.music_history;
    else if (!strcmp(playlist->conf_path, g_defaults.video_history->conf_path))
       playlist = g_defaults.video_history;
+#endif
+#ifdef HAVE_IMAGEVIEWER
    else if (!strcmp(playlist->conf_path, g_defaults.image_history->conf_path))
       playlist = g_defaults.image_history;
-   else if (!strcmp(playlist->conf_path, g_defaults.content_history->conf_path))
-      playlist = g_defaults.content_history;
+#endif
+
 
    playlist_delete_index(playlist, rpl_entry_selection_ptr);