diff --git a/src/components/NotificationList/index.tsx b/src/components/NotificationList/index.tsx
index 8003568f..05a9979a 100644
--- a/src/components/NotificationList/index.tsx
+++ b/src/components/NotificationList/index.tsx
@@ -108,7 +108,10 @@ export default function NotificationList() {
     }
 
     if (notifications.length > 0) {
-      setNotifications((oldNotifications) => [...oldNotifications, ...notifications])
+      setNotifications((oldNotifications) => [
+        ...oldNotifications,
+        ...notifications.filter((event) => event.pubkey !== pubkey)
+      ])
     }
 
     setUntil(notifications[notifications.length - 1].created_at - 1)
diff --git a/src/components/ParentNotePreview/index.tsx b/src/components/ParentNotePreview/index.tsx
index 127816ae..d3f4e4e4 100644
--- a/src/components/ParentNotePreview/index.tsx
+++ b/src/components/ParentNotePreview/index.tsx
@@ -22,7 +22,7 @@ export default function ParentNotePreview({
       onClick={onClick}
     >
       <div className="shrink-0">{t('reply to')}</div>
-      <UserAvatar userId={event.pubkey} size="tiny" />
+      <UserAvatar className="shrink-0" userId={event.pubkey} size="tiny" />
       <div className="truncate">{event.content}</div>
     </div>
   )
diff --git a/src/pages/secondary/NotePage/index.tsx b/src/pages/secondary/NotePage/index.tsx
index f68c0c9c..79e2e2ca 100644
--- a/src/pages/secondary/NotePage/index.tsx
+++ b/src/pages/secondary/NotePage/index.tsx
@@ -52,7 +52,9 @@ export default function NotePage({ id, index }: { id?: string; index?: number })
   return (
     <SecondaryPageLayout index={index} titlebarContent={t('Note')} displayScrollToTopButton>
       <div className="px-4">
-        <ParentNote key={`root-note-${event.id}`} eventId={rootEventId} />
+        {rootEventId !== parentEventId && (
+          <ParentNote key={`root-note-${event.id}`} eventId={rootEventId} />
+        )}
         <ParentNote key={`parent-note-${event.id}`} eventId={parentEventId} />
         <Note key={`note-${event.id}`} event={event} fetchNoteStats />
       </div>