diff --git a/client/lib/filter.js b/client/lib/filter.js
index d349d306a..e74c95478 100644
--- a/client/lib/filter.js
+++ b/client/lib/filter.js
@@ -372,14 +372,14 @@ class AdvancedFilter {
   }
 
   _fieldNameToId(field) {
-    const found = CustomFields.findOne({
+    const found = ReactiveCache.getCustomField({
       name: field,
     });
     return found._id;
   }
 
   _fieldValueToId(field, value) {
-    const found = CustomFields.findOne({
+    const found = ReactiveCache.getCustomField({
       name: field,
     });
     if (
diff --git a/models/cards.js b/models/cards.js
index dd81faee1..5c1e2504d 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -533,7 +533,7 @@ Cards.helpers({
     // Map custom fields to new board
     return this.customFields.map(cf => {
       const oldCf = ReactiveCache.getCustomField(cf._id);
-      const newCf = CustomFields.findOne({
+      const newCf = ReactiveCache.getCustomField({
         boardIds: boardId,
         name: oldCf.name,
         type: oldCf.type,
diff --git a/models/customFields.js b/models/customFields.js
index 2e4602106..5ba6d3cc6 100644
--- a/models/customFields.js
+++ b/models/customFields.js
@@ -337,7 +337,7 @@ if (Meteor.isServer) {
       Authentication.checkBoardAccess(req.userId, paramBoardId);
       JsonRoutes.sendResult(res, {
         code: 200,
-        data: CustomFields.findOne({
+        data: ReactiveCache.getCustomField({
           _id: paramCustomFieldId,
           boardIds: { $in: [paramBoardId] },
         }),
@@ -377,7 +377,7 @@ if (Meteor.isServer) {
       boardIds: [board._id],
     });
 
-    const customField = CustomFields.findOne({
+    const customField = ReactiveCache.getCustomField({
       _id: id,
       boardIds: { $in: [paramBoardId] },
     });