diff --git a/playlist.c b/playlist.c
index 1b40826f76..ebfc8db398 100644
--- a/playlist.c
+++ b/playlist.c
@@ -187,8 +187,8 @@ void content_playlist_push(content_playlist_t *playlist,
 
    playlist->entries[0].path      = path ? strdup(path) : NULL;
    playlist->entries[0].label     = label ? strdup(label) : NULL;
-   playlist->entries[0].core_path = strdup(core_path);
-   playlist->entries[0].core_name = strdup(core_name);
+   playlist->entries[0].core_path = core_path ? strdup(core_path) : NULL;
+   playlist->entries[0].core_name = core_name ? strdup(core_name) : NULL;
    playlist->entries[0].crc32     = crc32 ? strdup(crc32) : NULL;
    playlist->size++;
 }