diff --git a/config/shortcodes/index.js b/config/shortcodes/index.js
index b92f7a16..409c579b 100644
--- a/config/shortcodes/index.js
+++ b/config/shortcodes/index.js
@@ -29,7 +29,7 @@ export const img = async (
     filenameFormat: (id, src, width, format, options) => {
       const extension = path.extname(src);
       const name = path.basename(src, extension);
-      return `${name}-${width}w.${format}`;
+      return `${encodeURIComponent(name)}-${width}w.${format}`;
     },
   });
 
diff --git a/src/_data/albums.js b/src/_data/albums.js
index 7076dceb..e865978f 100644
--- a/src/_data/albums.js
+++ b/src/_data/albums.js
@@ -14,8 +14,8 @@ export default async function () {
       artist: album['artist']['name'],
       plays: album['playcount'],
       rank: album['@attr']['rank'],
-      image: `https://cdn.coryd.dev/albums/${removeAccents(album['artist']['name']).replace(/\s+/g, '-').toLowerCase()}-${removeAccents(album['name'].replace(/[:\/\\,'']+/g
-, '').replace(/\s+/g, '-').toLowerCase())}.jpg`,
+      image: `https://cdn.coryd.dev/albums/${encodeURIComponent(removeAccents(album['artist']['name']).replace(/\s+/g, '-').toLowerCase())}-${encodeURIComponent(removeAccents(album['name'].replace(/[:\/\\,'']+/g
+      , '').replace(/\s+/g, '-').toLowerCase()))}.jpg`,
       url: album['mbid']
         ? `https://musicbrainz.org/album/${album['mbid']}`
         : `https://musicbrainz.org/taglookup/index?tag-lookup.artist=${album['artist'][
diff --git a/src/_data/artists.js b/src/_data/artists.js
index f3f9159a..40bf122a 100644
--- a/src/_data/artists.js
+++ b/src/_data/artists.js
@@ -23,7 +23,7 @@ export default async function () {
       title: artist['name'],
       plays: artist['playcount'],
       rank: artist['@attr']['rank'],
-      image: `https://cdn.coryd.dev/artists/${removeAccents(artist['name']).replace(/\s+/g, '-').toLowerCase()}.jpg`,
+      image: `https://cdn.coryd.dev/artists/${encodeURIComponent(removeAccents(artist['name']).replace(/\s+/g, '-').toLowerCase())}.jpg`,
       url: mbid
         ? `https://musicbrainz.org/artist/${mbid}`
         : `https://musicbrainz.org/search?query=${artist['name'].replace(