diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
index 8d6895235..0d5aa5a2b 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt
@@ -130,7 +130,7 @@ fun AppNavigation(
 
                 if (scrollToTop) {
                     notifFeedViewModel.clear()
-                    notifFeedViewModel.sendToTop()
+                    notifFeedViewModel.invalidateDataAndSendToTop()
                     it.arguments?.remove("scrollToTop")
                 }
 
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 344041d37..e918a46eb 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
@@ -101,11 +101,10 @@ fun WatchAccountForNotifications(
     accountViewModel: AccountViewModel
 ) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = remember(accountState) { accountState?.account } ?: return
 
     var firstTime by remember(accountViewModel) { mutableStateOf(true) }
 
-    LaunchedEffect(accountViewModel, account.defaultNotificationFollowList) {
+    LaunchedEffect(accountViewModel, accountState?.account?.defaultNotificationFollowList) {
         if (firstTime) {
             firstTime = false
         } else {