diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade
index f4de2584b..3b3b4582f 100644
--- a/client/components/cards/minicard.jade
+++ b/client/components/cards/minicard.jade
@@ -11,7 +11,7 @@ template(name="minicard")
         .handle
           .fa.fa-arrows
     if cover
-      .minicard-cover(style="background-image: url('{{cover.link}}');")
+      .minicard-cover(style="background-image: url('{{cover.link 'original' '/'}}');")
     if labels
       .minicard-labels
         each labels
diff --git a/models/cards.js b/models/cards.js
index 949b3402f..378bb8f51 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -535,7 +535,10 @@ Cards.helpers({
 
   cover() {
     if (!this.coverId) return false;
-    return Attachments.findOne(this.coverId);
+    const cover = Attachments.findOne(this.coverId);
+    // if we return a cover before it is fully stored, we will get errors when we try to display it
+    // todo XXX we could return a default "upload pending" image in the meantime?
+    return cover && cover.path && cover;
   },
 
   checklists() {