diff --git a/music/models.py b/music/models.py
index 1eb02f7b..89419ee5 100644
--- a/music/models.py
+++ b/music/models.py
@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.db import models
 from django.core.serializers.json import DjangoJSONEncoder
 from django.shortcuts import reverse
-from common.models import Entity, Mark, Review, Tag
+from common.models import Entity, Mark, Review, Tag, SourceSiteEnum
 from common.utils import ChoicesDictGenerator, GenerateDateUUIDMediaFilePath
 from django.utils import timezone
 from django.conf import settings
@@ -48,6 +48,9 @@ class Album(Entity):
     def __str__(self):
         return self.title
 
+    def get_embed_link(self):
+        return self.source_url.replace("open.spotify.com/", "open.spotify.com/embed/") if self.source_site == SourceSiteEnum.SPOTIFY.value else None
+
     def get_absolute_url(self):
         return reverse("music:retrieve_album", args=[self.id])
 
@@ -87,6 +90,9 @@ class Song(Entity):
     def __str__(self):
         return self.title
 
+    def get_embed_link(self):
+        return self.source_url.replace("open.spotify.com/", "open.spotify.com/embed/") if self.source_site == SourceSiteEnum.SPOTIFY.value else None
+
     def get_absolute_url(self):
         return reverse("music:retrieve_song", args=[self.id])
 
diff --git a/music/templates/music/album_detail.html b/music/templates/music/album_detail.html
index 9a18e05c..6b74e313 100644
--- a/music/templates/music/album_detail.html
+++ b/music/templates/music/album_detail.html
@@ -350,6 +350,9 @@
                             {% endif %}
                         </div>
                                 
+                        {% if album.source_site == "spotify" %}
+                        <iframe src="{{ album.get_embed_link }}"  height="320" frameborder="0" allowtransparency="true" allow="encrypted-media"></iframe>
+                        {% endif %}
                     </div>
                 </div>
             </section>
diff --git a/music/templates/music/song_detail.html b/music/templates/music/song_detail.html
index 79b3d83e..1442145d 100644
--- a/music/templates/music/song_detail.html
+++ b/music/templates/music/song_detail.html
@@ -295,7 +295,10 @@
 
                             {% endif %}
                         </div>
-                                
+
+                        {% if song.source_site == "spotify" %}
+                        <iframe src="{{ song.get_embed_link }}"  height="80" frameborder="0" allowtransparency="true" allow="encrypted-media"></iframe>
+                        {% endif %}
                     </div>
                 </div>
             </section>