diff --git a/src/inputs/file_http.c b/src/inputs/file_http.c
index 01ff0e20..5206fee3 100644
--- a/src/inputs/file_http.c
+++ b/src/inputs/file_http.c
@@ -144,13 +144,10 @@ metadata_get_http(struct input_metadata *metadata, struct input_source *source)
       return -1; // TODO Perhaps a problem since this prohibits the player updating metadata
     }
 
-  if (m->artist)
-    swap_pointers(&metadata->artist, &m->artist);
+  swap_pointers(&metadata->artist, &m->artist);
   // Note we map title to album, because clients should show stream name as titel
-  if (m->title)
-    swap_pointers(&metadata->album, &m->title);
-  if (m->artwork_url)
-    swap_pointers(&metadata->artwork_url, &m->artwork_url);
+  swap_pointers(&metadata->album, &m->title);
+  swap_pointers(&metadata->artwork_url, &m->artwork_url);
 
   http_icy_metadata_free(m, 0);
   return 0;