diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt
index 5c58429de..c02668cf7 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt
@@ -84,7 +84,7 @@ fun ChatroomComposeChannelOrUser(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val channelHex by remember {
+    val channelHex by remember(baseNote) {
         derivedStateOf {
             baseNote.channelHex()
         }
@@ -103,7 +103,7 @@ private fun ChatroomDirectMessage(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val userRoomHex by remember {
+    val userRoomHex by remember(baseNote) {
         derivedStateOf {
             (baseNote.event as? PrivateDmEvent)?.talkingWith(accountViewModel.userProfile().pubkeyHex)
         }