diff --git a/src/client/components/forms/field-types/RichText/CommandToolbar/index.js b/src/client/components/forms/field-types/RichText/CommandToolbar/index.js
index 23e3944e00..029084c848 100644
--- a/src/client/components/forms/field-types/RichText/CommandToolbar/index.js
+++ b/src/client/components/forms/field-types/RichText/CommandToolbar/index.js
@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import PropTypes from 'prop-types';
 import { useSlate, useFocused } from 'slate-react';
 import { ToolbarElement, ToolbarMark, ToolbarList } from '@udecode/slate-plugins';
 
diff --git a/src/client/components/forms/field-types/RichText/index.js b/src/client/components/forms/field-types/RichText/index.js
index bb81f2e963..8e1bba24dd 100644
--- a/src/client/components/forms/field-types/RichText/index.js
+++ b/src/client/components/forms/field-types/RichText/index.js
@@ -59,25 +59,6 @@ const plugins = [
       },
     ],
   }),
-  ExitBreakPlugin({
-    rules: [
-      {
-        hotkey: 'mod+enter',
-      },
-      {
-        hotkey: 'mod+shift+enter',
-        before: true,
-      },
-      {
-        hotkey: 'enter',
-        query: {
-          start: true,
-          end: true,
-          allow: nodeTypes.headingTypes,
-        },
-      },
-    ],
-  }),
 ];
 
 const withPlugins = [
@@ -123,19 +104,6 @@ const RichText = (props) => {
     errorMessage,
   } = fieldType;
 
-  const [internalState, setInternalState] = useState(value);
-  const [valueHasLoaded, setValueHasLoaded] = useState(false);
-
-  useEffect(() => { setValue(internalState); }, [setValue, internalState]);
-
-  useEffect(() => {
-    // ! could use review
-    if (value !== undefined && !valueHasLoaded) {
-      setInternalState(value);
-      setValueHasLoaded(true);
-    }
-  }, [value, valueHasLoaded]);
-
   const classes = [
     baseClass,
     'field-type',
@@ -163,8 +131,8 @@ const RichText = (props) => {
       <div className={`${baseClass}__wrapper`}>
         <Slate
           editor={editor}
-          value={internalState ?? emptyRichTextNode}
-          onChange={val => setInternalState(val)}
+          value={value ?? emptyRichTextNode}
+          onChange={val => setValue(val)}
         >
           <CommandToolbar enabledPluginList={plugins} />