diff --git a/music/models.py b/music/models.py
index 600c51b3..5d785a5a 100644
--- a/music/models.py
+++ b/music/models.py
@@ -51,7 +51,7 @@ class Album(Entity):
     def get_embed_link(self):
         if self.source_site == SourceSiteEnum.SPOTIFY.value:
             return self.source_url.replace("open.spotify.com/", "open.spotify.com/embed/")
-        elif self.source_site == SourceSiteEnum.BANDCAMP.value:
+        elif self.source_site == SourceSiteEnum.BANDCAMP.value and self.other_info and 'bandcamp_album_id' in self.other_info:
             return f"https://bandcamp.com/EmbeddedPlayer/album={self.other_info['bandcamp_album_id']}/size=large/bgcol=ffffff/linkcol=19A2CA/artwork=small/transparent=true/"
         else:
             return None
diff --git a/music/templates/music/album_detail.html b/music/templates/music/album_detail.html
index bd12822d..e9981253 100644
--- a/music/templates/music/album_detail.html
+++ b/music/templates/music/album_detail.html
@@ -351,7 +351,7 @@
                             {% endif %}
                         </div>
                                 
-                        {% if album.source_site == "spotify" or album.source_site == "bandcamp" %}
+                        {% if album.get_embed_link %}
                         <iframe src="{{ album.get_embed_link }}"  height="320" frameborder="0" allowtransparency="true" allow="encrypted-media"></iframe>
                         {% endif %}
                     </div>