diff --git a/cores/dynamic_dummy.c b/cores/dynamic_dummy.c
index 17d84a0444..d0a691c96a 100644
--- a/cores/dynamic_dummy.c
+++ b/cores/dynamic_dummy.c
@@ -50,7 +50,7 @@ void libretro_dummy_retro_get_system_info(
       struct retro_system_info *info)
 {
    memset(info, 0, sizeof(*info));
-   info->library_name     = "No Core";
+   info->library_name     = "";
    info->library_version  = "";
    info->need_fullpath    = false;
    info->valid_extensions = ""; /* Nothing. */
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index 04053749de..838dc60dee 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -105,9 +105,9 @@ void menu_entries_get_core_title(char *s, size_t len)
    const char *core_name     = global ? global->menu.info.library_name    : NULL;
    const char *core_version  = global ? global->menu.info.library_version : NULL;
 
-   if (!core_name)
+   if (!core_name || core_name[0] == '\0')
       core_name = global->system.info.library_name;
-   if (!core_name)
+   if (!core_name || core_name[0] == '\0')
       core_name = menu_hash_to_str(MENU_VALUE_NO_CORE);
 
    if (!core_version)