diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index c4d36f09b8..c1d7217581 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1540,13 +1540,17 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
       if (core_name)
          strlcpy(fill_buf, core_name, path_size);
 
-      if (!is_history && i == selection)
+      if (!is_history && i == selection && !string_is_empty(label))
       {
          char *content_basename = strdup(label);
-         menu_driver_set_thumbnail_content(content_basename, strlen(content_basename) + 1);
-         menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH, NULL);
-         menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE, NULL);
-         free(content_basename);
+
+         if (!string_is_empty(content_basename))
+         {
+            menu_driver_set_thumbnail_content(content_basename, strlen(content_basename) + 1);
+            menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH, NULL);
+            menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE, NULL);
+            free(content_basename);
+         }
       }
 
       if (path)