diff --git a/assets/javascripts/discourse-assign/connectors/flagged-post-controls/claim-flagged-post.hbs b/assets/javascripts/discourse-assign/connectors/flagged-post-controls/claim-flagged-post.hbs
index 6bee346..a1100d6 100644
--- a/assets/javascripts/discourse-assign/connectors/flagged-post-controls/claim-flagged-post.hbs
+++ b/assets/javascripts/discourse-assign/connectors/flagged-post-controls/claim-flagged-post.hbs
@@ -1,3 +1 @@
-{{#if actableFilter}}
-  {{claim-topic topic=flaggedPost.topic}}
-{{/if}}
+{{claim-topic topic=flaggedPost.topic}}
diff --git a/assets/javascripts/discourse-assign/connectors/flagged-post-controls/claim-flagged-post.js.es6 b/assets/javascripts/discourse-assign/connectors/flagged-post-controls/claim-flagged-post.js.es6
new file mode 100644
index 0000000..c6d22f8
--- /dev/null
+++ b/assets/javascripts/discourse-assign/connectors/flagged-post-controls/claim-flagged-post.js.es6
@@ -0,0 +1,5 @@
+export default {
+  shouldRender(args) {
+    return args.actableFilter && !args.topic;
+  }
+};