diff --git a/oarepo_ui/theme/assets/semantic-ui/js/oarepo_ui/forms/components/BaseFormLayout/BaseFormLayout.jsx b/oarepo_ui/theme/assets/semantic-ui/js/oarepo_ui/forms/components/BaseFormLayout/BaseFormLayout.jsx
index 4dea6ba8..d25c776f 100644
--- a/oarepo_ui/theme/assets/semantic-ui/js/oarepo_ui/forms/components/BaseFormLayout/BaseFormLayout.jsx
+++ b/oarepo_ui/theme/assets/semantic-ui/js/oarepo_ui/forms/components/BaseFormLayout/BaseFormLayout.jsx
@@ -115,7 +115,7 @@ export const BaseFormLayout = ({ formikProps }) => {
               id={buildUID(overridableIdPrefix, "CustomFields.container")}
             >
               <CustomFields
-                config={customFields.ui}
+                config={customFields?.ui}
                 templateLoaders={[
                   (widget) => import(`@templates/custom_fields/${widget}.js`),
                   (widget) => import(`react-invenio-forms`),
diff --git a/setup.cfg b/setup.cfg
index 28422565..a85a6e7d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-ui
-version = 5.2.19
+version = 5.2.20
 description = UI module for invenio 3.5+
 long_description = file: README.md
 long_description_content_type = text/markdown