diff --git a/controllers/serveController.js b/controllers/serveController.js
index b5e5bb06..4381a788 100644
--- a/controllers/serveController.js
+++ b/controllers/serveController.js
@@ -161,10 +161,10 @@ module.exports = {
   },
   serveOrShowAsset (fileInfo, extension, method, headers, originalUrl, ip, res) {
     // add file extension to the file info
-    if (extension === '.gifv') {
-      fileInfo['fileExt'] = '.gifv';
+    if (extension === 'gifv') {
+      fileInfo['fileExt'] = 'gifv';
     } else {
-      fileInfo['fileExt'] = fileInfo.fileName.substring(fileInfo.fileName.lastIndexOf('.'));
+      fileInfo['fileExt'] = fileInfo.fileName.substring(fileInfo.fileName.lastIndexOf('.') + 1);
     }
     // serve or show
     switch (method) {
diff --git a/routes/serve-routes.js b/routes/serve-routes.js
index 6937c9a3..12c2184a 100644
--- a/routes/serve-routes.js
+++ b/routes/serve-routes.js
@@ -36,18 +36,18 @@ module.exports = (app) => {
     let claimId = null;
     let channelId = null;
     let method;
-    let extension;
+    let fileExtension;
     // parse the name
     const positionOfExtension = name.indexOf('.');
     if (positionOfExtension >= 0) {
-      extension = name.substring(positionOfExtension);
+      fileExtension = name.substring(positionOfExtension + 1);
       name = name.substring(0, positionOfExtension);
       /* patch because twitter player preview adds '>' before file extension */
       if (name.indexOf('>') >= 0) {
         name = name.substring(0, name.indexOf('>'));
       }
       /* end patch */
-      logger.debug('file extension =', extension);
+      logger.debug('file extension =', fileExtension);
       if (headers['accept'] && headers['accept'].split(',').includes('text/html')) {
         method = SHOWLITE;
       } else {
@@ -88,7 +88,7 @@ module.exports = (app) => {
       if (!fileInfo) {
         res.status(200).render('noClaims');
       } else {
-        return serveOrShowAsset(fileInfo, extension, method, headers, originalUrl, ip, res);
+        return serveOrShowAsset(fileInfo, fileExtension, method, headers, originalUrl, ip, res);
       }
     })
     // 3. update the file
@@ -139,7 +139,7 @@ module.exports = (app) => {
         if (headers['accept'] && headers['accept'].split(',').includes('text/html')) {
           method = SHOWLITE;
         }
-        fileExtension = name.substring(name.indexOf('.'));
+        fileExtension = name.substring(name.indexOf('.') + 1);
         name = name.substring(0, name.indexOf('.'));
         logger.debug('file extension =', fileExtension);
       } else {
@@ -157,7 +157,7 @@ module.exports = (app) => {
         if (!fileInfo) {
           res.status(200).render('noClaims');
         } else {
-          return serveOrShowAsset(fileInfo, null, method, headers, originalUrl, ip, res);
+          return serveOrShowAsset(fileInfo, fileExtension, method, headers, originalUrl, ip, res);
         }
       })
       // 3. update the database
diff --git a/views/partials/asset.handlebars b/views/partials/asset.handlebars
index 59d4deaa..eb607d24 100644
--- a/views/partials/asset.handlebars
+++ b/views/partials/asset.handlebars
@@ -1,8 +1,8 @@
 <div class="panel">
 	<div id="asset-placeholder">
-		<a href="/{{fileInfo.claimId}}/{{fileInfo.name}}{{fileInfo.fileExt}}">
+		<a href="/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}">
 		{{#ifConditional fileInfo.fileType '===' 'video/mp4'}}
-			{{#ifConditional fileInfo.fileExt '===' '.gifv'}}
+			{{#ifConditional fileInfo.fileExt '===' 'gifv'}}
 				<video class="show-asset" autoplay loop muted>
 					<source src="/media/{{fileInfo.fileName}}">
 					{{!--fallback--}}
diff --git a/views/partials/assetInfo.handlebars b/views/partials/assetInfo.handlebars
index c01427b4..b9406f9d 100644
--- a/views/partials/assetInfo.handlebars
+++ b/views/partials/assetInfo.handlebars
@@ -6,18 +6,18 @@
 	<h2 class="subheader">Links</h2>
 	{{!--short direct link to asset--}}
 	<div class="share-option">
-		<a href="/{{fileInfo.shortId}}/{{fileInfo.name}}{{fileInfo.fileExt}}">Permanent Short Link</a> (most convenient)
+		<a href="/{{fileInfo.shortId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}">Permanent Short Link</a> (most convenient)
 		<div class="input-error" id="input-error-copy-short-link" hidden="true"></div>
 		<br/>
-		<input type="text" id="short-link" class="link" readonly spellcheck="false" value="https://spee.ch/{{fileInfo.shortId}}/{{fileInfo.name}}{{fileInfo.fileExt}}" onclick="select()"/>
+		<input type="text" id="short-link" class="link" readonly spellcheck="false" value="https://spee.ch/{{fileInfo.shortId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}" onclick="select()"/>
 		<button class="copy-button" data-elementtocopy="short-link" onclick="copyToClipboard(event)">copy</button>
 	</div>
 	{{!-- link to show route for asset--}}
 	<div class="share-option">
-		<a href="/{{fileInfo.claimId}}/{{fileInfo.name}}{{fileInfo.fileExt}}">Permanent Long Link</a> (fastest service)
+		<a href="/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}">Permanent Long Link</a> (fastest service)
 		<div class="input-error" id="input-error-copy-long-link" hidden="true"></div>
 		</br>
-		<input type="text" id="long-link" class="link" readonly onclick="select()" spellcheck="false" value="https://spee.ch/{{fileInfo.claimId}}/{{fileInfo.name}}{{fileInfo.fileExt}}"/>
+		<input type="text" id="long-link" class="link" readonly onclick="select()" spellcheck="false" value="https://spee.ch/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}"/>
 		<button class="copy-button" data-elementtocopy="long-link" onclick="copyToClipboard(event)">copy</button>
 	</div>
 	{{!-- html text for embedding asset--}}
@@ -26,9 +26,9 @@
 		<div class="input-error" id="input-error-copy-embed-text" hidden="true"></div>
 		<br/>
 		{{#ifConditional fileInfo.fileType '===' 'video/mp4'}}
-			<input type="text" id="embed-text" class="link" readonly onclick="select()" spellcheck="false" value='&lt;video width="100%" controls src="https://spee.ch/{{fileInfo.claimId}}/{{fileInfo.name}}{{fileInfo.fileExt}}"/>&lt;/video>'/>
+			<input type="text" id="embed-text" class="link" readonly onclick="select()" spellcheck="false" value='&lt;video width="100%" controls src="https://spee.ch/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}"/>&lt;/video>'/>
 		{{else}}
-			<input type="text" id="embed-text" class="link" readonly onclick="select()" spellcheck="false" value='&lt;img src="https://spee.ch/{{fileInfo.claimId}}/{{fileInfo.name}}{{fileInfo.fileExt}}" />'/>
+			<input type="text" id="embed-text" class="link" readonly onclick="select()" spellcheck="false" value='&lt;img src="https://spee.ch/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}}" />'/>
 		{{/ifConditional}}
 		<button class="copy-button" data-elementtocopy="embed-text" onclick="copyToClipboard(event)">copy</button>
 	</div>
@@ -39,7 +39,7 @@
 		Markdown
 		<div class="input-error" id="input-error-copy-markdown-text" hidden="true"></div>
 		<br/>
-		<input type="text" id="markdown-text" class="link" readonly onclick="select()" spellcheck="false" value='![{{fileInfo.name}}](https://spee.ch/{{fileInfo.claimId}}/{{fileInfo.name}}{{fileInfo.fileExt}})'/>
+		<input type="text" id="markdown-text" class="link" readonly onclick="select()" spellcheck="false" value='![{{fileInfo.name}}](https://spee.ch/{{fileInfo.claimId}}/{{fileInfo.name}}.{{fileInfo.fileExt}})'/>
 		<button class="copy-button" data-elementtocopy="markdown-text" onclick="copyToClipboard(event)">copy</button>
 	</div>
 	{{/ifConditional}}