diff --git a/app/src/main/java/com/swoosh/microblog/ui/feed/FeedViewModel.kt b/app/src/main/java/com/swoosh/microblog/ui/feed/FeedViewModel.kt
index 31f29ac..4565db1 100644
--- a/app/src/main/java/com/swoosh/microblog/ui/feed/FeedViewModel.kt
+++ b/app/src/main/java/com/swoosh/microblog/ui/feed/FeedViewModel.kt
@@ -79,7 +79,7 @@ class FeedViewModel(application: Application) : AndroidViewModel(application) {
     private val _popularTags = MutableStateFlow<List<GhostTagFull>>(emptyList())
     val popularTags: StateFlow<List<GhostTagFull>> = _popularTags.asStateFlow()
 
-    private val _tagsEnabled = MutableStateFlow(true)
+    private val _tagsEnabled = MutableStateFlow(tagsPreferences.isTagsEnabled())
     val tagsEnabled: StateFlow<Boolean> = _tagsEnabled.asStateFlow()
 
     private val _accounts = MutableStateFlow<List<GhostAccount>>(emptyList())
@@ -343,6 +343,15 @@ class FeedViewModel(application: Application) : AndroidViewModel(application) {
         }
     }
 
+    fun refreshTagsEnabled() {
+        val enabled = tagsPreferences.isTagsEnabled()
+        _tagsEnabled.value = enabled
+        if (!enabled) {
+            _popularTags.value = emptyList()
+            _uiState.update { it.copy(activeTagFilter = null) }
+        }
+    }
+
     fun filterByTag(tag: String) {
         _uiState.update { it.copy(activeTagFilter = tag) }
         refresh()
diff --git a/app/src/main/java/com/swoosh/microblog/ui/navigation/NavGraph.kt b/app/src/main/java/com/swoosh/microblog/ui/navigation/NavGraph.kt
index 030f5f3..b6d6327 100644
--- a/app/src/main/java/com/swoosh/microblog/ui/navigation/NavGraph.kt
+++ b/app/src/main/java/com/swoosh/microblog/ui/navigation/NavGraph.kt
@@ -109,6 +109,7 @@ fun SwooshNavGraph(
                             onClick = {
                                 if (item.route == Routes.FEED) {
                                     feedViewModel.deactivateSearch()
+                                    feedViewModel.refreshTagsEnabled()
                                 }
                                 navController.navigate(item.route) {
                                     popUpTo(navController.graph.findStartDestination().id) {