diff --git a/src/features/compose/components/compose-form.tsx b/src/features/compose/components/compose-form.tsx
index e09f8bb4a..64aba3425 100644
--- a/src/features/compose/components/compose-form.tsx
+++ b/src/features/compose/components/compose-form.tsx
@@ -302,8 +302,9 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
       <QuotedStatusContainer composeId={id} />
 
       <div
-        className={clsx('ml-[-56px] flex flex-wrap items-center justify-between sm:ml-0', {
+        className={clsx('flex flex-wrap items-center justify-between', {
           'hidden': condensed,
+          'ml-[-56px] sm:ml-0': withAvatar,
         })}
       >
         {renderButtons()}
diff --git a/src/features/compose/editor/plugins/state-plugin.tsx b/src/features/compose/editor/plugins/state-plugin.tsx
index 7a8262262..78742326a 100644
--- a/src/features/compose/editor/plugins/state-plugin.tsx
+++ b/src/features/compose/editor/plugins/state-plugin.tsx
@@ -79,7 +79,7 @@ const StatePlugin: React.FC<IStatePlugin> = ({ composeId, isWysiwyg }) => {
   }, 750), []);
 
   useEffect(() => {
-    editor.registerUpdateListener(({ editorState }) => {
+    return editor.registerUpdateListener(({ editorState }) => {
       const plainText = editorState.read(() => $getRoot().getTextContent());
       let text = plainText;
       if (isWysiwyg) {