diff --git a/ts/components/CompositionArea.tsx b/ts/components/CompositionArea.tsx
index 0e80d03f17..4fb5e6f9a1 100644
--- a/ts/components/CompositionArea.tsx
+++ b/ts/components/CompositionArea.tsx
@@ -930,13 +930,9 @@ export function CompositionArea({
                   ? () => scrollToMessage(conversationId, quotedMessageId)
                   : undefined
               }
-              onClose={
-                draftEditMessage
-                  ? undefined
-                  : () => {
-                      setQuoteByMessageId(conversationId, undefined);
-                    }
-              }
+              onClose={() => {
+                setQuoteByMessageId(conversationId, undefined);
+              }}
             />
           </div>
         )}
diff --git a/ts/state/ducks/composer.ts b/ts/state/ducks/composer.ts
index 8741f8a22d..936805f7b3 100644
--- a/ts/state/ducks/composer.ts
+++ b/ts/state/ducks/composer.ts
@@ -749,7 +749,18 @@ export function setQuoteByMessageId(
     }
 
     const draftEditMessage = conversation.get('draftEditMessage');
-    if (draftEditMessage) {
+    // We can remove quotes, but we can't add them
+    if (draftEditMessage && messageId) {
+      return;
+    }
+    if (draftEditMessage && draftEditMessage.quote) {
+      conversation.set({
+        draftEditMessage: {
+          ...draftEditMessage,
+          quote: undefined,
+        },
+      });
+      dispatch(setComposerFocus(conversation.id));
       return;
     }