diff --git a/frontend/src/Components/Page/Header/ArtistSearchInputConnector.js b/frontend/src/Components/Page/Header/ArtistSearchInputConnector.js
index 4303d9774..214303358 100644
--- a/frontend/src/Components/Page/Header/ArtistSearchInputConnector.js
+++ b/frontend/src/Components/Page/Header/ArtistSearchInputConnector.js
@@ -25,9 +25,15 @@ function createCleanArtistSelector() {
           sortName,
           foreignArtistId,
           images,
-          tags: tags.map((id) => {
-            return allTags.find((tag) => tag.id === id);
-          })
+          tags: tags.reduce((acc, id) => {
+            const matchingTag = allTags.find((tag) => tag.id === id);
+
+            if (matchingTag) {
+              acc.push(matchingTag);
+            }
+
+            return acc;
+          }, [])
         };
       });
     }