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();
diff --git a/src/views/user/following.tsx b/src/views/user/following.tsx
index 829a9a687..99d6a8088 100644
--- a/src/views/user/following.tsx
+++ b/src/views/user/following.tsx
@@ -6,6 +6,7 @@ import { useAdditionalRelayContext } from "../../providers/local/additional-rela
 import useUserContactList from "../../hooks/use-user-contact-list";
 import { getPubkeysFromList } from "../../helpers/nostr/lists";
 import { useWebOfTrust } from "../../providers/global/web-of-trust-provider";
+import { ErrorBoundary } from "../../components/error-boundary";
 
 export default function UserFollowingTab() {
   const webOfTrust = useWebOfTrust();
@@ -22,7 +23,9 @@ export default function UserFollowingTab() {
   return (
     <SimpleGrid columns={{ base: 1, lg: 2, xl: 3 }} spacing="2" p="2">
       {sorted.map(({ pubkey, relay }) => (
-        <UserCard key={pubkey} pubkey={pubkey} relay={relay} />
+        <ErrorBoundary>
+          <UserCard key={pubkey} pubkey={pubkey} relay={relay} />
+        </ErrorBoundary>
       ))}
     </SimpleGrid>
   );