diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt
index 2634b6a05..b03a8b102 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt
@@ -11,7 +11,7 @@ object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
   var channel: com.vitorpamplona.amethyst.model.Channel? = null
 
   fun loadMessagesBetween(channelId: String) {
-    channel = LocalCache.channels[channelId]
+    channel = LocalCache.getOrCreateChannel(channelId)
     resetFilters()
   }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
index 7162d3c4d..a40a4aa41 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
@@ -23,7 +23,7 @@ fun ClickableRoute(
   navController: NavController
 ) {
   if (nip19.type == Nip19.Type.USER) {
-    val userBase = LocalCache.getOrCreateUser(nip19.hex.toByteArray())
+    val userBase = LocalCache.getOrCreateUser(nip19.hex)
     val userState by userBase.live.observeAsState()
     val user = userState?.user ?: return
 
@@ -48,8 +48,8 @@ fun ClickableRoute(
       )
     } else if (note.channel != null) {
       ClickableText(
-        text = AnnotatedString("@${note.channel} "),
-        onClick = { navController.navigate("Channel/${nip19.hex}") },
+        text = AnnotatedString("@${note.channel?.toBestDisplayName()} "),
+        onClick = { navController.navigate("Channel/${note.channel?.idHex}") },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
       )
     } else {