diff --git a/client/build/components/AssetPreview/index.js b/client/build/components/AssetPreview/index.js
index c17b70e3..994b75ce 100644
--- a/client/build/components/AssetPreview/index.js
+++ b/client/build/components/AssetPreview/index.js
@@ -19,7 +19,7 @@ var AssetPreview = function AssetPreview(_ref) {
       fileExt = _ref$claimData.fileExt,
       contentType = _ref$claimData.contentType,
       thumbnail = _ref$claimData.thumbnail;
-  var directSourceLink = "".concat(claimId, "/").concat(name, ".").concat(fileExt);
+  var directSourceLink = "asset/".concat(name, "/").concat(claimId);
   var showUrlLink = "/".concat(claimId, "/").concat(name);
   return _react.default.createElement(_reactRouterDom.Link, {
     to: showUrlLink
diff --git a/client/build/containers/AssetDisplay/view.js b/client/build/containers/AssetDisplay/view.js
index f034edf7..c0d1f013 100644
--- a/client/build/containers/AssetDisplay/view.js
+++ b/client/build/containers/AssetDisplay/view.js
@@ -82,7 +82,7 @@ function (_React$Component) {
           case 'image/gif':
             return _react.default.createElement("img", {
               className: "asset-image",
-              src: "/".concat(claimId, "/").concat(name, ".").concat(fileExt),
+              src: "/asset/".concat(name, "/").concat(claimId),
               alt: name
             });
 
@@ -92,7 +92,7 @@ function (_React$Component) {
               controls: true,
               poster: thumbnail
             }, _react.default.createElement("source", {
-              src: "/".concat(claimId, "/").concat(name, ".").concat(fileExt)
+              src: "/asset/".concat(name, "/").concat(claimId)
             }), _react.default.createElement("p", null, "Your browser does not support the ", _react.default.createElement("code", null, "video"), " element."));
 
           default:
diff --git a/client/src/components/AssetPreview/index.jsx b/client/src/components/AssetPreview/index.jsx
index ae721a08..e9e10cef 100644
--- a/client/src/components/AssetPreview/index.jsx
+++ b/client/src/components/AssetPreview/index.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 
 const AssetPreview = ({ defaultThumbnail, claimData: { name, claimId, fileExt, contentType, thumbnail } }) => {
-  const directSourceLink = `${claimId}/${name}.${fileExt}`;
+  const directSourceLink = `asset/${name}/${claimId}`;
   const showUrlLink = `/${claimId}/${name}`;
   return (
     <Link to={showUrlLink} >
diff --git a/client/src/containers/AssetDisplay/view.jsx b/client/src/containers/AssetDisplay/view.jsx
index 277a4980..c742c851 100644
--- a/client/src/containers/AssetDisplay/view.jsx
+++ b/client/src/containers/AssetDisplay/view.jsx
@@ -39,7 +39,7 @@ class AssetDisplay extends React.Component {
               return (
                 <img
                   className='asset-image'
-                  src={`/${claimId}/${name}.${fileExt}`}
+                  src={`/asset/${name}/${claimId}`}
                   alt={name}
                 />
               );
@@ -49,7 +49,9 @@ class AssetDisplay extends React.Component {
                   className='asset-video'
                   controls poster={thumbnail}
                 >
-                  <source src={`/${claimId}/${name}.${fileExt}`} />
+                  <source
+                    src={`/asset/${name}/${claimId}`}
+                  />
                   <p>Your browser does not support the <code>video</code> element.</p>
                 </video>
               );
diff --git a/server/views/embed.handlebars b/server/views/embed.handlebars
index eb6c4839..c0b2e4f5 100644
--- a/server/views/embed.handlebars
+++ b/server/views/embed.handlebars
@@ -1 +1 @@
-<video width="100%" controls src="{{host}}/{{claimId}}/{{name}}.mp4" type="video/mp4"></video>
+<video width="100%" controls src="{{host}}/asset/{{name}}/{{claimId}}" type="video/mp4"></video>