diff --git a/helpers/serveHelpers.js b/helpers/serveHelpers.js
index 7301927c..9dedd8b5 100644
--- a/helpers/serveHelpers.js
+++ b/helpers/serveHelpers.js
@@ -5,7 +5,7 @@ function createOpenGraphInfo ({ fileType, claimId, name, fileName, fileExt }) {
     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}`,
+    directFileUrl: `https://spee.ch/${claimId}/${name}${fileExt}`,
   };
 }
 
diff --git a/views/partials/asset.handlebars b/views/partials/asset.handlebars
index bbbdb8e6..6d6062d5 100644
--- a/views/partials/asset.handlebars
+++ b/views/partials/asset.handlebars
@@ -1,19 +1,19 @@
 {{#ifConditional fileInfo.fileType '===' 'video/mp4'}}
     {{#ifConditional fileInfo.fileExt '===' 'gifv'}}
         <video class="gifv-show" autoplay loop muted>
-            <source src="/media/{{fileInfo.fileName}}">
+            <source src="/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}">
             {{!--fallback--}}
             Your browser does not support the <code>video</code> element.
         </video>
     {{else}}
         <video id="video-player" class="video-show" controls poster="{{fileInfo.thumbnail}}">
-            <source src="/media/{{fileInfo.fileName}}">
+            <source src="/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}">
             {{!--fallback--}}
             Your browser does not support the <code>video</code> element.
         </video>
     {{/ifConditional}}
 {{else}}
     <a href="/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}">
-        <img  class="image-show" src="/media/{{fileInfo.fileName}}" />
+        <img  class="image-show" src="/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}" />
     </a>
 {{/ifConditional}}
\ No newline at end of file
diff --git a/views/showLite.handlebars b/views/showLite.handlebars
index 115beaf7..ce807ced 100644
--- a/views/showLite.handlebars
+++ b/views/showLite.handlebars
@@ -1,13 +1,13 @@
 {{#ifConditional fileInfo.fileType '===' 'video/mp4'}}
     {{#ifConditional fileInfo.fileExt '===' '.gifv'}}
         <video class="show-asset-light" autoplay loop muted>
-            <source src="/media/{{fileInfo.fileName}}">
+            <source src="/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}">
             {{!--fallback--}}
             Your browser does not support the <code>video</code> element.
         </video>
     {{else}}
         <video class="show-asset-light" controls id="video-player">
-            <source src="/media/{{fileInfo.fileName}}">
+            <source src="/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}">
             {{!--fallback--}}
             Your browser does not support the <code>video</code> element.
         </video>
@@ -16,6 +16,6 @@
     hosted via <a href="/{{fileInfo.claimId}}/{{fileInfo.name}}">spee&lt;h</a>
 {{else}}
 <a href="/{{fileInfo.claimId}}/{{fileInfo.name}}">
-    <img class="show-asset-lite" src="/media/{{fileInfo.fileName}}" alt="{{fileInfo.fileName}}"/>
+    <img class="show-asset-lite" src="/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}" alt="{{fileInfo.fileName}}"/>
 </a>
 {{/ifConditional}}
\ No newline at end of file