diff --git a/assets/js/src/form_editor/components/form_settings/codemirror_wrap.jsx b/assets/js/src/form_editor/components/form_settings/codemirror_wrap.jsx
index 85f8f1ce3d..7c69a9251b 100644
--- a/assets/js/src/form_editor/components/form_settings/codemirror_wrap.jsx
+++ b/assets/js/src/form_editor/components/form_settings/codemirror_wrap.jsx
@@ -31,12 +31,22 @@ CodemirrorWrap.propTypes = {
   value: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired,
   options: PropTypes.shape({
-    lineNumbers: PropTypes.bool.isRequired,
-    tabMode: PropTypes.string.isRequired,
-    matchBrackets: PropTypes.bool.isRequired,
-    theme: PropTypes.string.isRequired,
-    mode: PropTypes.string.isRequired,
-  }).isRequired,
+    lineNumbers: PropTypes.bool,
+    tabMode: PropTypes.string,
+    matchBrackets: PropTypes.bool,
+    theme: PropTypes.string,
+    mode: PropTypes.string,
+  }),
+};
+
+CodemirrorWrap.defaultProps = {
+  options: {
+    lineNumbers: true,
+    tabMode: 'indent',
+    matchBrackets: true,
+    theme: 'neo',
+    mode: 'css',
+  },
 };
 
 export default CodemirrorWrap;
diff --git a/assets/js/src/form_editor/components/form_settings/custom_css_panel.jsx b/assets/js/src/form_editor/components/form_settings/custom_css_panel.jsx
index 6b55280030..abcd8deab4 100644
--- a/assets/js/src/form_editor/components/form_settings/custom_css_panel.jsx
+++ b/assets/js/src/form_editor/components/form_settings/custom_css_panel.jsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import React from 'react';
 import {
   Panel,
   PanelBody,
@@ -12,24 +12,13 @@ export default () => {
     (select) => select('mailpoet-form-editor').getFormStyles(),
     []
   );
-  const options = useRef({
-    lineNumbers: true,
-    tabMode: 'indent',
-    matchBrackets: true,
-    theme: 'neo',
-    mode: 'css',
-  });
 
   const { changeFormStyles } = useDispatch('mailpoet-form-editor');
 
   return (
     <Panel>
       <PanelBody title={MailPoet.I18n.t('customCss')} initialOpen={false}>
-        <CodeMirror
-          value={styles}
-          options={options.current}
-          onChange={changeFormStyles}
-        />
+        <CodeMirror value={styles} onChange={changeFormStyles} />
       </PanelBody>
     </Panel>
   );