diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index b305c5684..115954f21 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -41,7 +41,7 @@ Template.attachmentGallery.events({
 });
 
 function getNextAttachmentId(currentAttachmentId) {
-    const attachments = Attachments.find({'meta.cardId': cardId}).get();
+    const attachments = ReactiveCache.getAttachments({'meta.cardId': cardId});
 
     let i = 0;
     for (; i < attachments.length; i++) {
@@ -53,7 +53,7 @@ function getNextAttachmentId(currentAttachmentId) {
 }
 
 function getPrevAttachmentId(currentAttachmentId) {
-  const attachments = Attachments.find({'meta.cardId': cardId}).get();
+  const attachments = ReactiveCache.getAttachments({'meta.cardId': cardId});
 
   let i = 0;
   for (; i < attachments.length; i++) {
diff --git a/client/components/settings/attachments.js b/client/components/settings/attachments.js
index 6982c2f32..82dc78cca 100644
--- a/client/components/settings/attachments.js
+++ b/client/components/settings/attachments.js
@@ -45,7 +45,7 @@ BlazeComponent.extendComponent({
 
 BlazeComponent.extendComponent({
   getBoardsWithAttachments() {
-    this.attachments = Attachments.find().get();
+    this.attachments = ReactiveCache.getAttachments();
     this.attachmentsByBoardId = _.chain(this.attachments)
       .groupBy(fileObj => fileObj.meta.boardId)
       .value();