diff --git a/helpers/serveHelpers.js b/helpers/serveHelpers.js
index 87d9c042..62a5447d 100644
--- a/helpers/serveHelpers.js
+++ b/helpers/serveHelpers.js
@@ -62,7 +62,7 @@ function checkLocalDbForClaims (name, shortUrl) {
 
 function createOpenGraphInfo ({ fileType, claimId, name, fileName, fileExt }) {
   return {
-    embedUrl     : `https://spee.ch/embed/${fileName}`,
+    embedUrl     : `https://spee.ch/embed/${claimId}/${name}`,
     showUrl      : `https://spee.ch/${claimId}/${name}`,
     source       : `https://spee.ch/${claimId}/${name}${fileExt}`,
     directFileUrl: `https://spee.ch/media/${fileName}`,
diff --git a/routes/page-routes.js b/routes/page-routes.js
index 864e6ddb..3869d1e3 100644
--- a/routes/page-routes.js
+++ b/routes/page-routes.js
@@ -36,10 +36,14 @@ module.exports = (app) => {
       });
   });
   // route to display all free public claims at a given name
-  app.get('/embed/:fileName', ({ params }, res) => {
-    const fileName = params.fileName;
+  app.get('/embed/:claimId/:name', ({ params }, res) => {
+    const claimId = params.claimId;
+    const name = params.name;
+    const dummyParam = ' ';
+    console.log('claimId ==', claimId);
+    console.log('name ==', name);
     // get and render the content
-    res.status(200).render('embed', { layout: 'embed', fileName });
+    res.status(200).render('embed', { layout: 'embed', claimId, name, dummyParam });
   });
   // route to display all free public claims at a given name
   app.get('/:name/all', ({ ip, originalUrl, params }, res) => {
diff --git a/views/embed.handlebars b/views/embed.handlebars
index 22023070..b39a68a0 100644
--- a/views/embed.handlebars
+++ b/views/embed.handlebars
@@ -1 +1 @@
-<video id="video" width="100%" controls><source src="https://spee.ch/media/{{fileName}}" type="video/mp4"></video>
\ No newline at end of file
+<video id="video" width="100%" controls><source src="https://spee.ch/{{claimId}}/{{name}}.mp4" type="video/mp4">{{dummyParam}}</video>
\ No newline at end of file