diff --git a/packages/core/helper-plugin/lib/src/hooks/useCustomFields/index.js b/packages/core/helper-plugin/lib/src/hooks/useCustomFields/index.js
index 690ba1661d..6ca66e35b9 100644
--- a/packages/core/helper-plugin/lib/src/hooks/useCustomFields/index.js
+++ b/packages/core/helper-plugin/lib/src/hooks/useCustomFields/index.js
@@ -8,11 +8,11 @@ import { useContext, useRef } from 'react';
 import CustomFieldsContext from '../../contexts/CustomFieldsContext';
 
 const useCustomFields = () => {
-  const customFieldsApi = useContext(CustomFieldsContext);
+  const customFields = useContext(CustomFieldsContext);
   // Use a ref so we can safely add the custom fields to a hook dependencies array
-  const customFieldsApiRef = useRef(customFieldsApi);
+  const customFieldsRef = useRef(customFields);
 
-  return customFieldsApiRef.current;
+  return customFieldsRef.current;
 };
 
 export default useCustomFields;
diff --git a/packages/core/helper-plugin/lib/src/providers/CustomFieldsProvider/index.js b/packages/core/helper-plugin/lib/src/providers/CustomFieldsProvider/index.js
index 9dbb0243ce..41f48323c1 100644
--- a/packages/core/helper-plugin/lib/src/providers/CustomFieldsProvider/index.js
+++ b/packages/core/helper-plugin/lib/src/providers/CustomFieldsProvider/index.js
@@ -9,14 +9,7 @@ import CustomFieldsContext from '../../contexts/CustomFieldsContext';
 
 const CustomFieldsProvider = ({ children, customFields }) => {
   return (
-    <CustomFieldsContext.Provider
-      value={{
-        customFields: customFields.getAll(),
-        getCustomField: customFields.get.bind(customFields),
-      }}
-    >
-      {children}
-    </CustomFieldsContext.Provider>
+    <CustomFieldsContext.Provider value={customFields}>{children}</CustomFieldsContext.Provider>
   );
 };