diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
index a22826de7..8bd63e6f9 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
@@ -580,7 +580,7 @@ fun BechLink(
             )
         }
     } else if (loadedLink?.nip19 != null) {
-        Row { ClickableRoute(loadedLink?.nip19!!, accountViewModel, nav) }
+        ClickableRoute(loadedLink?.nip19!!, accountViewModel, nav)
     } else {
         val text =
             remember(word) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt
index 4f8965bfc..2c29bcc8d 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt
@@ -225,6 +225,7 @@ fun ChatroomListScreenOnlyList(
         val observer =
             LifecycleEventObserver { _, event ->
                 if (event == Lifecycle.Event.ON_RESUME) {
+                    NostrChatroomListDataSource.account = accountViewModel.account
                     NostrChatroomListDataSource.start()
                 }
             }
@@ -303,6 +304,7 @@ fun WatchAccountForListScreen(
 ) {
     LaunchedEffect(accountViewModel) {
         launch(Dispatchers.IO) {
+            NostrChatroomListDataSource.account = accountViewModel.account
             NostrChatroomListDataSource.start()
             knownFeedViewModel.invalidateData(true)
             newFeedViewModel.invalidateData(true)