diff --git a/src/components/embed-types/nostr.tsx b/src/components/embed-types/nostr.tsx
index 15bbe4e6c..b251b1f00 100644
--- a/src/components/embed-types/nostr.tsx
+++ b/src/components/embed-types/nostr.tsx
@@ -1,9 +1,9 @@
-import { EmbedableContent, embedJSX } from "../../helpers/embeds";
-import { DraftNostrEvent, NostrEvent } from "../../types/nostr-event";
-import QuoteNote from "../note/quote-note";
-import { UserLink } from "../user-link";
 import { Link } from "@chakra-ui/react";
 import { Link as RouterLink } from "react-router-dom";
+
+import { EmbedableContent, embedJSX } from "../../helpers/embeds";
+import { DraftNostrEvent, NostrEvent } from "../../types/nostr-event";
+import { UserLink } from "../user-link";
 import { getMatchHashtag, getMatchNostrLink, stripInvisibleChar } from "../../helpers/regexp";
 import { safeDecode } from "../../helpers/nip19";
 import { EmbedEventPointer } from "../embed-event";
@@ -48,7 +48,11 @@ export function embedNostrMentions(content: EmbedableContent, event: NostrEvent
           return <UserLink color="blue.500" pubkey={tag[1]} showAt />;
         }
         if (tag[0] === "e" && tag[1]) {
-          return <QuoteNote noteId={tag[1]} relays={tag[2] ? [tag[2]] : undefined} />;
+          return (
+            <EmbedEventPointer
+              pointer={{ type: "nevent", data: { id: tag[1], relays: tag[2] ? [tag[2]] : undefined } }}
+            />
+          );
         }
       }
 
diff --git a/src/components/note/components/repost-button.tsx b/src/components/note/components/repost-button.tsx
index 44c2b9780..87f97d3c3 100644
--- a/src/components/note/components/repost-button.tsx
+++ b/src/components/note/components/repost-button.tsx
@@ -17,7 +17,6 @@ import { NostrEvent } from "../../../types/nostr-event";
 import { RepostIcon } from "../../icons";
 import { buildRepost } from "../../../helpers/nostr/events";
 import clientRelaysService from "../../../services/client-relays";
-import QuoteNote from "../quote-note";
 import NostrPublishAction from "../../../classes/nostr-publish-action";
 import { useSigningContext } from "../../../providers/signing-provider";
 import { EmbedEvent } from "../../embed-event";
diff --git a/src/components/note/index.tsx b/src/components/note/index.tsx
index d46d78f87..04cc005c9 100644
--- a/src/components/note/index.tsx
+++ b/src/components/note/index.tsx
@@ -22,7 +22,7 @@ import { EventRelays } from "./note-relays";
 import { UserLink } from "../user-link";
 import { UserDnsIdentityIcon } from "../user-dns-identity-icon";
 import NoteZapButton from "./note-zap-button";
-import { ExpandProvider } from "./expanded";
+import { ExpandProvider } from "../../providers/expanded";
 import useSubject from "../../hooks/use-subject";
 import appSettings from "../../services/settings/app-settings";
 import EventVerificationIcon from "../event-verification-icon";
diff --git a/src/components/note/note-content-with-warning.tsx b/src/components/note/note-content-with-warning.tsx
index 24fa89d1f..d16dff29f 100644
--- a/src/components/note/note-content-with-warning.tsx
+++ b/src/components/note/note-content-with-warning.tsx
@@ -1,7 +1,7 @@
 import { NostrEvent } from "../../types/nostr-event";
 
 import { NoteContents } from "./note-contents";
-import { useExpand } from "./expanded";
+import { useExpand } from "../../providers/expanded";
 import SensitiveContentWarning from "../sensitive-content-warning";
 import useAppSettings from "../../hooks/use-app-settings";
 
diff --git a/src/components/note/quote-note.tsx b/src/components/note/quote-note.tsx
deleted file mode 100644
index fb4e77a77..000000000
--- a/src/components/note/quote-note.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { useReadRelayUrls } from "../../hooks/use-client-relays";
-import useSingleEvent from "../../hooks/use-single-event";
-import EmbeddedNote from "../embed-event/event-types/embedded-note";
-import { NoteLink } from "../note-link";
-
-/** @deprecated */
-const QuoteNote = ({ noteId, relays }: { noteId: string; relays?: string[] }) => {
-  const readRelays = useReadRelayUrls(relays);
-  const { event, loading } = useSingleEvent(noteId, readRelays);
-
-  return event ? <EmbeddedNote event={event} /> : <NoteLink noteId={noteId} />;
-};
-
-export default QuoteNote;
diff --git a/src/components/sensitive-content-warning.tsx b/src/components/sensitive-content-warning.tsx
index c59ff8b18..9842daedd 100644
--- a/src/components/sensitive-content-warning.tsx
+++ b/src/components/sensitive-content-warning.tsx
@@ -9,7 +9,7 @@ import {
   useBreakpointValue,
   useModal,
 } from "@chakra-ui/react";
-import { useExpand } from "./note/expanded";
+import { useExpand } from "../providers/expanded";
 
 export default function SensitiveContentWarning({ description }: { description: string } & AlertProps) {
   const expand = useExpand();
diff --git a/src/components/note/expanded.tsx b/src/providers/expanded.tsx
similarity index 100%
rename from src/components/note/expanded.tsx
rename to src/providers/expanded.tsx