diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 7871f52b7d..9f598ecb36 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -126,7 +126,7 @@ module.exports = React.createClass({
                 } else if (i < Constants.MAX_DISPLAY_FILES) {
                     postFiles.push(
                         <div className="post-image__column custom-file" key={fileInfo.name+i}>
-                            <a href={fileInfo.path+"."+fileInfo.ext} download={fileInfo.name+"."+fileInfo.ext}>
+                            <a href={fileInfo.path + (fileInfo.ext ? "." + fileInfo.ext : "")} download={fileInfo.name + (fileInfo.ext ? "." + fileInfo.ext : "")}>
                                 <div className={"file-icon "+utils.getIconClassName(type)}/>
                             </a>
                         </div>
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 00580af6e3..fbf1e0d4f0 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -546,10 +546,13 @@ module.exports.getIconClassName = function(fileType) {
 
 module.exports.splitFileLocation = function(fileLocation) {
     var fileSplit = fileLocation.split('.');
-    if (fileSplit.length < 2) return {};
 
-    var ext = fileSplit[fileSplit.length-1];
-    fileSplit.splice(fileSplit.length-1,1)
+    var ext = "";
+    if (fileSplit.length > 1) {
+        ext = fileSplit[fileSplit.length - 1];
+        fileSplit.splice(fileSplit.length - 1, 1);
+    }
+
     var filePath = fileSplit.join('.');
     var filename = filePath.split('/')[filePath.split('/').length-1];