diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/TextNoteEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/TextNoteEvent.kt
index da7fca088..363cce07a 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/TextNoteEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/TextNoteEvent.kt
@@ -87,6 +87,11 @@ class TextNoteEvent(
                     tags.add(arrayOf("q", it))
                 }
             }
+            addresses?.forEach {
+                if (it.toTag() in directMentions) {
+                    tags.add(arrayOf("q", it.toTag()))
+                }
+            }
             addresses
                 ?.map { it.toTag() }
                 ?.let {