diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index f33a560867..b2dc65acd5 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -440,13 +440,17 @@ createWidget("post-contents", {
   },
 
   toggleFilteredRepliesView() {
-    const post = this.findAncestorModel();
-    const controller = this.register.lookup("controller:topic");
-    if (post.get("topic.postStream.filterRepliesToPostNumber")) {
-      controller.send(
-        "cancelFilter",
-        post.get("topic.postStream.filterRepliesToPostNumber")
+    const post = this.findAncestorModel(),
+      controller = this.register.lookup("controller:topic"),
+      currentFilterPostNumber = post.get(
+        "topic.postStream.filterRepliesToPostNumber"
       );
+
+    if (
+      currentFilterPostNumber &&
+      currentFilterPostNumber === post.post_number
+    ) {
+      controller.send("cancelFilter", currentFilterPostNumber);
       this.state.filteredRepliesShown = false;
     } else {
       this.state.filteredRepliesShown = true;