diff --git a/api/resolvers/notifications.js b/api/resolvers/notifications.js
index e1a88237..0adf3130 100644
--- a/api/resolvers/notifications.js
+++ b/api/resolvers/notifications.js
@@ -67,7 +67,7 @@ export default {
         (SELECT "Item".id::TEXT, "Item".created_at AS "sortTime", NULL as "earnedSats",
           'Reply' AS type
           FROM "Item"
-          JOIN "Item" p ON "Item"."parentId" = p.id
+          JOIN "Item" p ON "Item".path <@ p.path
           WHERE p."userId" = $1
             AND "Item"."userId" <> $1 AND "Item".created_at <= $2
           ORDER BY "Item".created_at DESC
diff --git a/api/resolvers/user.js b/api/resolvers/user.js
index 1d01f7d8..b448d557 100644
--- a/api/resolvers/user.js
+++ b/api/resolvers/user.js
@@ -175,7 +175,7 @@ export default {
       const newReplies = await models.$queryRaw(`
         SELECT "Item".id, "Item".created_at
           FROM "Item"
-          JOIN "Item" p ON "Item"."parentId" = p.id
+          JOIN "Item" p ON "Item".path <@ p.path
           WHERE p."userId" = $1
           AND ("Item".created_at > $2 OR $2 IS NULL)  AND "Item"."userId" <> $1
           LIMIT 1`, user.id, user.checkedNotesAt)
diff --git a/components/notifications.js b/components/notifications.js
index b986c6fc..357ccf10 100644
--- a/components/notifications.js
+++ b/components/notifications.js
@@ -63,7 +63,7 @@ function Notification ({ n }) {
                 ? <Item item={n.item} />
                 : (
                   <div className='pb-2'>
-                    <Comment item={n.item} noReply includeParent rootText={n.__typename === 'Reply' ? 'replying to you on:' : undefined} clickToContext />
+                    <Comment item={n.item} noReply includeParent rootText={n.__typename === 'Reply' ? 'replying on:' : undefined} clickToContext />
                   </div>)}
             </div>
           </>)}