diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/GeoHashScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/GeoHashScreen.kt
index 85f726e7e..4768c601f 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/GeoHashScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/GeoHashScreen.kt
@@ -187,7 +187,7 @@ fun GeoHashActionOptions(
         .follows
         .observeAsState()
     val isFollowingTag by
-        remember(userState) {
+        remember(userState, tag) {
             derivedStateOf { userState?.user?.isFollowingGeohash(tag) ?: false }
         }
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt
index 9acaf32d0..89841010c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt
@@ -166,7 +166,7 @@ fun HashtagActionOptions(
         .follows
         .observeAsState()
     val isFollowingTag by
-        remember(userState) {
+        remember(userState, tag) {
             derivedStateOf { userState?.user?.isFollowingHashtag(tag) ?: false }
         }