diff --git a/.changeset/four-foxes-lay.md b/.changeset/four-foxes-lay.md
new file mode 100644
index 000000000..96a59fd2a
--- /dev/null
+++ b/.changeset/four-foxes-lay.md
@@ -0,0 +1,5 @@
+---
+"nostrudel": patch
+---
+
+Fix null relay hints in DMs
diff --git a/src/helpers/nostr/event.ts b/src/helpers/nostr/event.ts
index c9decd7be..90609431f 100644
--- a/src/helpers/nostr/event.ts
+++ b/src/helpers/nostr/event.ts
@@ -289,11 +289,13 @@ export function addPubkeyRelayHints(draft: DraftNostrEvent) {
     ...draft,
     tags: draft.tags.map((t) => {
       if (isPTag(t) && !t[2]) {
-        const newTag = [...t];
         const mailboxes = userMailboxesService.getMailboxes(t[1]).value;
-        // TODO: Pick the best mailbox for the user
-        if (mailboxes) newTag[2] = mailboxes.inbox.urls[0];
-        return newTag;
+        if (mailboxes && mailboxes.inbox.urls.length > 0) {
+          const newTag = [...t];
+          // TODO: Pick the best mailbox for the user
+          newTag[2] = mailboxes.inbox.urls[0];
+          return newTag;
+        } else return t;
       }
       return t;
     }),
diff --git a/src/views/dms/components/send-message-form.tsx b/src/views/dms/components/send-message-form.tsx
index ce9fafeea..787b7b0e1 100644
--- a/src/views/dms/components/send-message-form.tsx
+++ b/src/views/dms/components/send-message-form.tsx
@@ -7,11 +7,9 @@ import { Button, Flex, FlexProps, Heading } from "@chakra-ui/react";
 import { useSigningContext } from "../../../providers/global/signing-provider";
 import MagicTextArea, { RefType } from "../../../components/magic-textarea";
 import { useTextAreaUploadFileWithForm } from "../../../hooks/use-textarea-upload-file";
-import clientRelaysService from "../../../services/client-relays";
 import { DraftNostrEvent } from "../../../types/nostr-event";
 import { useDecryptionContext } from "../../../providers/global/dycryption-provider";
 import useUserMailboxes from "../../../hooks/use-user-mailboxes";
-import RelaySet from "../../../classes/relay-set";
 import { usePublishEvent } from "../../../providers/global/publish-provider";
 
 export default function SendMessageForm({