diff --git a/ui/v2.5/src/components/Shared/CustomFields.tsx b/ui/v2.5/src/components/Shared/CustomFields.tsx
index 3f289af81..a522961a8 100644
--- a/ui/v2.5/src/components/Shared/CustomFields.tsx
+++ b/ui/v2.5/src/components/Shared/CustomFields.tsx
@@ -54,23 +54,28 @@ const CustomField: React.FC<{ field: string; value: unknown }> = ({
   );
 };
 
-export const CustomFields: React.FC<ICustomFields> = ({ values }) => {
-  const intl = useIntl();
-  if (Object.keys(values).length === 0) {
-    return null;
-  }
+export const CustomFields: React.FC<ICustomFields> = PatchComponent(
+  "CustomFields",
+  ({ values }) => {
+    const intl = useIntl();
+    if (Object.keys(values).length === 0) {
+      return null;
+    }
 
-  return (
-    // according to linter rule CSS classes shouldn't use underscores
-    <div className="custom-fields">
-      <CollapseButton text={intl.formatMessage({ id: "custom_fields.title" })}>
-        {Object.entries(values).map(([key, value]) => (
-          <CustomField key={key} field={key} value={value} />
-        ))}
-      </CollapseButton>
-    </div>
-  );
-};
+    return (
+      // according to linter rule CSS classes shouldn't use underscores
+      <div className="custom-fields">
+        <CollapseButton
+          text={intl.formatMessage({ id: "custom_fields.title" })}
+        >
+          {Object.entries(values).map(([key, value]) => (
+            <CustomField key={key} field={key} value={value} />
+          ))}
+        </CollapseButton>
+      </div>
+    );
+  }
+);
 
 function isNumeric(v: string) {
   return /^-?(?:0|(?:[1-9][0-9]*))(?:\.[0-9]+)?$/.test(v);
diff --git a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
index d5a91b567..1e3b0abbb 100644
--- a/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
+++ b/ui/v2.5/src/docs/en/Manual/UIPluginApi.md
@@ -149,6 +149,7 @@ Returns `void`.
 - `CompressedPerformerDetailsPanel`
 - `ConstantSetting`
 - `CountrySelect`
+- `CustomFields`
 - `CustomFieldInput`
 - `DateInput`
 - `DetailImage`
diff --git a/ui/v2.5/src/pluginApi.d.ts b/ui/v2.5/src/pluginApi.d.ts
index 01f6b754c..d9f755790 100644
--- a/ui/v2.5/src/pluginApi.d.ts
+++ b/ui/v2.5/src/pluginApi.d.ts
@@ -701,6 +701,7 @@ declare namespace PluginApi {
     PerformerCard: React.FC<any>;
     ExternalLinkButtons: React.FC<any>;
     ExternalLinksButton: React.FC<any>;
+    CustomFields: React.FC<any>;
     CustomFieldInput: React.FC<any>;
     ImageInput: React.FC<any>;
     DetailImage: React.FC<any>;