diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
index 65efa4cab..f68689df6 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -77,7 +77,7 @@ object LocalCache {
   }
 
   fun checkGetOrCreateNote(key: String): Note? {
-    if (key.startsWith("naddr1") || key.contains(":")) {
+    if (ATag.isATag(key)) {
       return checkGetOrCreateAddressableNote(key)
     }
     return try {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/ATag.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/ATag.kt
index 7e7b30608..ebdd47928 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/ATag.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/ATag.kt
@@ -34,6 +34,10 @@ data class ATag(val kind: Int, val pubKeyHex: String, val dTag: String, val rela
     }
 
     companion object {
+        fun isATag(key: String): Boolean {
+            return key.startsWith("naddr1") || key.contains(":")
+        }
+
         fun parse(address: String, relay: String?): ATag? {
             return if (address.startsWith("naddr") || address.startsWith("nostr:naddr"))
                 parseNAddr(address)