diff --git a/apps/comments-ui/src/components/Comment.js b/apps/comments-ui/src/components/Comment.js
index 8212411562..33665a9ebe 100644
--- a/apps/comments-ui/src/components/Comment.js
+++ b/apps/comments-ui/src/components/Comment.js
@@ -82,7 +82,7 @@ const Comment = (props) => {
                     leaveTo="opacity-0"
                 >
                     <div className="ml-14 my-10">
-                        <Form parent={comment} toggle={toggleReplyMode} isReply={true} toggleReplyMode={toggleReplyMode} />
+                        <Form parent={comment} toggle={toggleReplyMode} isReply={true} />
                     </div>
                 </Transition>
             </>
diff --git a/apps/comments-ui/src/components/Form.js b/apps/comments-ui/src/components/Form.js
index 0b4024c989..d867085308 100644
--- a/apps/comments-ui/src/components/Form.js
+++ b/apps/comments-ui/src/components/Form.js
@@ -87,8 +87,8 @@ const Form = (props) => {
         editor.on('blur', () => {
             if (editor?.isEmpty) {
                 setFormOpen(false);
-                if (props.isReply && props.toggleReplyMode) {
-                    props.toggleReplyMode();
+                if (props.isReply && props.toggle) {
+                    props.toggle();
                 }
             }
         });
@@ -109,7 +109,7 @@ const Form = (props) => {
                 });
             })
             .run();
-    }, [editor, props, props.isEdit, props.isReply, props.toggleReplyMode]);
+    }, [editor, props, props.isEdit, props.isReply, props.toggle]);
 
     const submitForm = async (event) => {
         event.preventDefault();
@@ -135,7 +135,7 @@ const Form = (props) => {
                 props.toggle();
 
                 setFormOpen(false);
-                props.toggleReplyMode();
+                props.toggle();
             } catch (e) {
                 // eslint-disable-next-line no-console
                 console.error(e);