diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade
index 7c7e2684c..975d21e84 100644
--- a/client/components/cards/attachments.jade
+++ b/client/components/cards/attachments.jade
@@ -20,7 +20,7 @@ template(name="attachmentsGalery")
     each attachments
       .attachment-item
         a.attachment-thumbnail.swipebox(href="{{link}}" title="{{name}}")
-          if isUploaded
+          if link
             if isImage
               img.attachment-thumbnail-img(src="{{link}}")
             else if($eq extension 'mp3')
@@ -38,7 +38,7 @@ template(name="attachmentsGalery")
             else
               span.attachment-thumbnail-ext= extension
           else
-            span.attachment-thumbnail-ext= extension
+            +spinner
         p.attachment-details
           = name
           span.file-size ({{fileSize size}} KB)
diff --git a/models/attachments.js b/models/attachments.js
index bb7702580..0f46d3568 100644
--- a/models/attachments.js
+++ b/models/attachments.js
@@ -89,7 +89,12 @@ if (Meteor.isServer) {
   });
 
   Meteor.startup(() => {
-    Attachments.collection.createIndex({ cardId: 1 });
+    Attachments.collection.createIndex({ 'meta.cardId': 1 });
+    const storagePath = fileStoreStrategyFactory.storagePath;
+    if (!fs.existsSync(storagePath)) {
+      console.log("create storagePath because it doesn't exist: " + storagePath);
+      fs.mkdirSync(storagePath, { recursive: true });
+    }
   });
 }
 
diff --git a/models/avatars.js b/models/avatars.js
index 1d038d075..49fd4c8af 100644
--- a/models/avatars.js
+++ b/models/avatars.js
@@ -59,6 +59,14 @@ if (Meteor.isServer) {
     remove: isOwner,
     fetch: ['userId'],
   });
+
+  Meteor.startup(() => {
+    const storagePath = fileStoreStrategyFactory.storagePath;
+    if (!fs.existsSync(storagePath)) {
+      console.log("create storagePath because it doesn't exist: " + storagePath);
+      fs.mkdirSync(storagePath, { recursive: true });
+    }
+  });
 }
 
 export default Avatars;