diff --git a/src/views/channels/components/send-message-form.tsx b/src/views/channels/components/send-message-form.tsx
index d15527ca1..874b8d57b 100644
--- a/src/views/channels/components/send-message-form.tsx
+++ b/src/views/channels/components/send-message-form.tsx
@@ -39,7 +39,7 @@ export default function ChannelMessageForm({
     let draft: DraftNostrEvent = {
       kind: kinds.ChannelMessage,
       content: values.content,
-      tags: [["e", channel.id]],
+      tags: [["e", rootId || channel.id, "", "root"]],
       created_at: dayjs().unix(),
     };
 
@@ -47,10 +47,6 @@ export default function ChannelMessageForm({
     draft = createEmojiTags(draft, emojis);
     draft = ensureNotifyPubkeys(draft, contentMentions);
 
-    if (rootId) {
-      draft.tags.push(["e", rootId, "", "root"]);
-    }
-
     setLoadingMessage("Signing...");
     await publish("Send DM", draft, undefined, false);
     reset();