diff --git a/server/publications/boards.js b/server/publications/boards.js
index bed8b8b73..32d9389bc 100644
--- a/server/publications/boards.js
+++ b/server/publications/boards.js
@@ -225,9 +225,10 @@ Meteor.publishRelations('board', function(boardId, isArchived) {
       this.cursor(Integrations.find({ boardId }));
       this.cursor(CardCommentReactions.find({ boardId }));
       this.cursor(
-        CustomFields.find(
+        ReactiveCache.getCustomFields(
           { boardIds: { $in: [boardId] } },
           { sort: { name: 1 } },
+          true,
         ),
       );
 
diff --git a/server/publications/cards.js b/server/publications/cards.js
index b0a4524f9..ac99719ab 100644
--- a/server/publications/cards.js
+++ b/server/publications/cards.js
@@ -789,7 +789,7 @@ function findCards(sessionId, query) {
         true,
       ),
       ReactiveCache.getLists({ _id: { $in: lists } }, { fields }, true),
-      CustomFields.find({ _id: { $in: customFieldIds } }),
+      ReactiveCache.getCustomFields({ _id: { $in: customFieldIds } }, {}, true),
       ReactiveCache.getUsers({ _id: { $in: users } }, { fields: Users.safeFields }, true),
       Checklists.find({ cardId: { $in: cards.map(c => c._id) } }),
       ChecklistItems.find({ cardId: { $in: cards.map(c => c._id) } }),
diff --git a/server/publications/customFields.js b/server/publications/customFields.js
index f39ae8d2f..4e7c890ec 100644
--- a/server/publications/customFields.js
+++ b/server/publications/customFields.js
@@ -1,4 +1,4 @@
 Meteor.publish('customFields', function() {
-  const ret = CustomFields.find();
+  const ret = ReactiveCache.getCustomFields(null, null, true);
   return ret;
 });