diff --git a/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControlPane.js b/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControlPane.js
index 367ab761..4a151eae 100644
--- a/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControlPane.js
+++ b/packages/netlify-cms-core/src/components/Editor/EditorControlPane/EditorControlPane.js
@@ -19,7 +19,7 @@ export default class ControlPane extends React.Component {
     const name = field.get('name');
 
     this.componentValidate[name] =
-      wrappedControl.innerWrappedControl.validate || wrappedControl.validate;
+      wrappedControl.innerWrappedControl?.validate || wrappedControl.validate;
   }
 
   validate = () => {