diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index 93b3290f7..8b1ea55fe 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -2876,12 +2876,12 @@ fun DisplayFollowingHashtagsInPost(
 ) {
     val noteEvent = remember { baseNote.event } ?: return
 
-    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val userFollowState by accountViewModel.userFollows.observeAsState()
     var firstTag by remember { mutableStateOf<String?>(null) }
 
-    LaunchedEffect(key1 = accountState) {
+    LaunchedEffect(key1 = userFollowState) {
         launch(Dispatchers.Default) {
-            val followingTags = accountState?.account?.followingTagSet() ?: emptySet()
+            val followingTags = userFollowState?.user?.cachedFollowingTagSet() ?: emptySet()
             val newFirstTag = noteEvent.firstIsTaggedHashes(followingTags)
 
             if (firstTag != newFirstTag) {