diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt
index 72e7766a8..1372f166d 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt
@@ -23,7 +23,9 @@ object NotificationFeedFilter : FeedFilter<Note>() {
             }
             .filter { it ->
                 it.event !is TextNoteEvent ||
-                    it.replyTo?.any { it.author == loggedInUser } == true ||
+                    (it.event as? TextNoteEvent)?.taggedEvents()?.any {
+                    LocalCache.checkGetOrCreateNote(it)?.author == loggedInUser
+                } == true ||
                     loggedInUser in it.directlyCiteUsers()
             }
             .filter {