diff --git a/src/state/queries/usePostThread/index.ts b/src/state/queries/usePostThread/index.ts
index 7696f87c41..0c9d1e3aa3 100644
--- a/src/state/queries/usePostThread/index.ts
+++ b/src/state/queries/usePostThread/index.ts
@@ -30,9 +30,9 @@ export function usePostThread({anchor}: {anchor?: string}) {
   const {
     isLoaded: isThreadPreferencesLoaded,
     sort,
-    setSort,
+    setSort: baseSetSort,
     view,
-    setView,
+    setView: baseSetView,
     prioritizeFollowedUsers,
   } = useThreadPreferences()
   const postThreadQueryKey = createPostThreadQueryKey({
@@ -254,6 +254,24 @@ export function usePostThread({anchor}: {anchor?: string}) {
     [qc, sort, view, postThreadQueryKey],
   )
 
+  const setSort: typeof baseSetSort = useCallback(
+    nextSort => {
+      setHiddenRepliesVisible(false)
+      setAdditionalHiddenItems([])
+      baseSetSort(nextSort)
+    },
+    [baseSetSort, setAdditionalHiddenItems, setHiddenRepliesVisible],
+  )
+
+  const setView: typeof baseSetView = useCallback(
+    nextView => {
+      setHiddenRepliesVisible(false)
+      setAdditionalHiddenItems([])
+      baseSetView(nextView)
+    },
+    [baseSetView, setAdditionalHiddenItems, setHiddenRepliesVisible],
+  )
+
   return useMemo(
     () => ({
       state: {