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 1c06fec3e..221862b37 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -58,7 +58,7 @@ object LocalCache {
 
     fun checkGetOrCreateUser(key: String): User? {
         return try {
-            val checkHex = Hex.decode(key).toNpub() // Checks if this is a valid Hex
+            checkIfValidHex(key)
             getOrCreateUser(key)
         } catch (e: IllegalArgumentException) {
             Log.e("LocalCache", "Invalid Key to create user: $key", e)
@@ -80,7 +80,7 @@ object LocalCache {
             return checkGetOrCreateAddressableNote(key)
         }
         return try {
-            val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
+            checkIfValidHex(key)
             getOrCreateNote(key)
         } catch (e: IllegalArgumentException) {
             Log.e("LocalCache", "Invalid Key to create note: $key", e)
@@ -99,7 +99,7 @@ object LocalCache {
 
     fun checkGetOrCreateChannel(key: String): Channel? {
         return try {
-            val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
+            checkIfValidHex(key)
             getOrCreateChannel(key)
         } catch (e: IllegalArgumentException) {
             Log.e("LocalCache", "Invalid Key to create channel: $key", e)
@@ -107,6 +107,10 @@ object LocalCache {
         }
     }
 
+    private fun checkIfValidHex(key: String) {
+        Hex.decode(key).toNpub()
+    }
+
     @Synchronized
     fun getOrCreateChannel(key: String): Channel {
         return channels[key] ?: run {