diff --git a/netlify/edge-functions/now-playing.js b/netlify/edge-functions/now-playing.js
index 132598ac..d53ee5ea 100644
--- a/netlify/edge-functions/now-playing.js
+++ b/netlify/edge-functions/now-playing.js
@@ -123,6 +123,12 @@ export default async () => {
   const track = trackData['recenttracks']['track'][0]
   const mbid = track['artist']['mbid']
   let genre = ''
+  const artistUrl = mbid
+    ? `https://musicbrainz.org/artist/${mbid}`
+    : `https://musicbrainz.org/search?query=${track['artist']['#text'].replace(
+        /\s+/g,
+        '+'
+      )}&type=artist`
 
   if (mbid && mbid !== '') {
     const genreUrl = `https://musicbrainz.org/ws/2/artist/${mbid}?inc=aliases+genres&fmt=json`
@@ -136,7 +142,7 @@ export default async () => {
   return Response.json({
     content: `${emojiMap(genre, track['artist']['#text'])} <a href="${track['url']}">${
       track['name']
-    } by ${track['artist']['#text']}</a>`,
+    }</a> by <a href="${artistUrl}">${track['artist']['#text']}</a>`,
   })
 }
 
diff --git a/src/_data/albums.js b/src/_data/albums.js
index 5f635c19..2b99a1a8 100644
--- a/src/_data/albums.js
+++ b/src/_data/albums.js
@@ -25,7 +25,9 @@ module.exports = async function () {
             .toLowerCase()}.jpg`,
       url: album['mbid']
         ? `https://musicbrainz.org/album/${album['mbid']}`
-        : `https://musicbrainz.org/search?query=${encodeURI(album['name'])}&type=release_group`,
+        : `https://musicbrainz.org/taglookup/index?tag-lookup.artist=${album['artist'][
+            'name'
+          ].replace(/\s+/g, '+')}&tag-lookup.release=${album['name'].replace(/\s+/g, '+')}`,
       type: 'album',
     }
   })
diff --git a/src/_data/artists.js b/src/_data/artists.js
index 8160bcab..dbf92777 100644
--- a/src/_data/artists.js
+++ b/src/_data/artists.js
@@ -18,7 +18,7 @@ module.exports = async function () {
         'https://cdn.coryd.dev/artists/missing-artist.jpg',
       url: artist['mbid']
         ? `https://musicbrainz.org/artist/${artist['mbid']}`
-        : `https://musicbrainz.org/search?query=${encodeURI(artist['name'])}&type=artist`,
+        : `https://musicbrainz.org/search?query=${artist['name'].replace(/\s+/g, '+')}&type=artist`,
       type: 'artist',
     }
   })