diff --git a/src/renderer/features/albums/routes/album-list-route.tsx b/src/renderer/features/albums/routes/album-list-route.tsx
index ad32b0bcd..5ad173c38 100644
--- a/src/renderer/features/albums/routes/album-list-route.tsx
+++ b/src/renderer/features/albums/routes/album-list-route.tsx
@@ -116,14 +116,14 @@ export const AlbumListRoute = () => {
 
       // * Adds server token
       if (isImageTokenRequired) {
-        const t = albums.data.map((album) => {
+        const data = albums.data.map((album) => {
           return {
             ...album,
-            imageUrl: album?.imageUrl + serverToken!,
+            imageUrl: album.imageUrl && album.imageUrl + serverToken!,
           };
         });
 
-        return { ...albums, data: t };
+        return { ...albums, data };
       }
 
       return albums;
diff --git a/src/renderer/features/player/hooks/use-playqueue-handler.ts b/src/renderer/features/player/hooks/use-playqueue-handler.ts
index 651ef534a..874e78c69 100644
--- a/src/renderer/features/player/hooks/use-playqueue-handler.ts
+++ b/src/renderer/features/player/hooks/use-playqueue-handler.ts
@@ -50,9 +50,10 @@ export const usePlayQueueHandler = () => {
         songs = songs.map((song) => {
           return {
             ...song,
-            imageUrl: isImageTokenRequired
-              ? `${song.imageUrl}${serverToken}`
-              : song.imageUrl,
+            imageUrl:
+              song.imageUrl && isImageTokenRequired
+                ? `${song.imageUrl}${serverToken}`
+                : song.imageUrl,
             streamUrl: `${song.streamUrl}${serverToken}`,
           };
         });