diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
index 4fc443540..1edbc6155 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
@@ -78,7 +78,7 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
         val feedViewModel: NostrChatRoomFeedViewModel = viewModel()
         val lifeCycleOwner = LocalLifecycleOwner.current
 
-        LaunchedEffect(Unit) {
+        LaunchedEffect(userId) {
             feedViewModel.invalidateData()
         }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
index ba0586e0b..ab8cd67ae 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
@@ -51,7 +51,7 @@ fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController)
     val pagerState = rememberPagerState()
     val coroutineScope = rememberCoroutineScope()
 
-    LaunchedEffect(Unit) {
+    LaunchedEffect(accountViewModel) {
         NostrHomeDataSource.resetFilters()
 
         feedViewModel.invalidateData()
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt
index fddf3e670..0ffd8bec6 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt
@@ -24,7 +24,7 @@ fun NotificationScreen(accountViewModel: AccountViewModel, navController: NavCon
     NotificationFeedFilter.account = account
     val feedViewModel: NotificationViewModel = viewModel()
 
-    LaunchedEffect(Unit) {
+    LaunchedEffect(accountViewModel) {
         feedViewModel.refresh()
     }