diff --git a/custom_components/mass_queue/actions.py b/custom_components/mass_queue/actions.py
index 1dd8bbf..cae811d 100644
--- a/custom_components/mass_queue/actions.py
+++ b/custom_components/mass_queue/actions.py
@@ -439,7 +439,7 @@ def format_playlist_track(self, playlist_track: dict) -> TRACK_ITEM_SCHEMA:
     def format_track_item(self, track_item: dict) -> TRACK_ITEM_SCHEMA:
         """Process an individual track item."""
         result = self.format_item(track_item)
-        media_album = track_item.get("album") or "N/A"
+        media_album = track_item.get("album")
         media_album_name = "" if media_album is None else media_album.get("name", "")
         artists = track_item["artists"]
         artist_names = [artist["name"] for artist in artists]
diff --git a/custom_components/mass_queue/utils.py b/custom_components/mass_queue/utils.py
index ba598d9..eda3601 100644
--- a/custom_components/mass_queue/utils.py
+++ b/custom_components/mass_queue/utils.py
@@ -156,8 +156,8 @@ def find_image_from_metadata(data: dict, remotely_accessible: bool):
 
 def find_image_from_album(data: dict, remotely_accessible: bool):
     """Attempts to find the image via the album key."""
-    album = data.get("album", {})
-    metadata = album.get("metadata", {})
+    album = data.get("album") or {}
+    metadata = album.get("metadata") or {}
     img_data = metadata.get("images")
     if img_data is None:
         return None