diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index d8ac333ce..2e87fc97e 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -159,7 +159,7 @@ BlazeComponent.extendComponent({
   },
 
   lastCustomField() {
-    const lastCustomField = CustomFields.findOne(
+    const lastCustomField = ReactiveCache.getCustomField(
       this.currentData().activity.customFieldId,
     );
     if (!lastCustomField) return null;
@@ -167,7 +167,7 @@ BlazeComponent.extendComponent({
   },
 
   lastCustomFieldValue() {
-    const lastCustomField = CustomFields.findOne(
+    const lastCustomField = ReactiveCache.getCustomField(
       this.currentData().activity.customFieldId,
     );
     if (!lastCustomField) return null;
diff --git a/client/components/sidebar/sidebarCustomFields.js b/client/components/sidebar/sidebarCustomFields.js
index 61b1cb2d8..549ff0b6d 100644
--- a/client/components/sidebar/sidebarCustomFields.js
+++ b/client/components/sidebar/sidebarCustomFields.js
@@ -275,7 +275,7 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
         'click .js-delete-custom-field': Popup.afterConfirm(
           'deleteCustomField',
           function() {
-            const customField = CustomFields.findOne(this._id);
+            const customField = ReactiveCache.getCustomField(this._id);
             if (customField.boardIds.length > 1) {
               CustomFields.update(customField._id, {
                 $pull: {
diff --git a/models/activities.js b/models/activities.js
index 251ec1f64..be3713eac 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -56,7 +56,7 @@ Activities.helpers({
     return ReactiveCache.getCard(this.subtaskId);
   },
   customField() {
-    return CustomFields.findOne(this.customFieldId);
+    return ReactiveCache.getCustomField(this.customFieldId);
   },
   // Label activity did not work yet, unable to edit labels when tried this.
   //label() {
diff --git a/models/cards.js b/models/cards.js
index 0ccc4f913..2ddbc7d27 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -532,7 +532,7 @@ Cards.helpers({
   mapCustomFieldsToBoard(boardId) {
     // Map custom fields to new board
     return this.customFields.map(cf => {
-      const oldCf = CustomFields.findOne(cf._id);
+      const oldCf = ReactiveCache.getCustomField(cf._id);
       const newCf = CustomFields.findOne({
         boardIds: boardId,
         name: oldCf.name,