diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt
index 18d367de4..c2f604bb0 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt
@@ -102,6 +102,12 @@ fun AccountScreen(
                         sharedPreferencesViewModel,
                     )
                 }
+
+                DisposableEffect(key1 = accountState) {
+                    onDispose {
+                        state.currentViewModelStore.viewModelStore.clear()
+                    }
+                }
             }
             is AccountState.LoggedInViewOnly -> {
                 CompositionLocalProvider(
@@ -113,6 +119,12 @@ fun AccountScreen(
                         sharedPreferencesViewModel,
                     )
                 }
+
+                DisposableEffect(key1 = accountState) {
+                    onDispose {
+                        state.currentViewModelStore.viewModelStore.clear()
+                    }
+                }
             }
         }
     }