diff --git a/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs
index ab53f6f29cf..2c7ea0c9474 100644
--- a/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs
@@ -1,12 +1,14 @@
 <th data-sort-order='{{order}}' class='{{view.className}}'>
-  {{~#if showBulkToggle}}
-      <button class='btn bulk-select' title='{{i18n "topics.bulk.toggle"}}'><i class='fa fa-list'></i></button>
-  {{/if ~}}
-  {{~#if bulkSelectEnabled}}
-    <span class='bulk-select-topics'>
-      <button class='btn bulk-select-all'>{{i18n "topics.bulk.select_all"}}</button>
-      <button class='btn bulk-clear-all'>{{i18n "topics.bulk.clear_all"}}</button>
-    </span>
+  {{~#if canBulkSelect}}
+    {{~#if showBulkToggle}}
+        <button class='btn bulk-select' title='{{i18n "topics.bulk.toggle"}}'><i class='fa fa-list'></i></button>
+    {{/if ~}}
+    {{~#if bulkSelectEnabled}}
+      <span class='bulk-select-topics'>
+        <button class='btn bulk-select-all'>{{i18n "topics.bulk.select_all"}}</button>
+        <button class='btn bulk-clear-all'>{{i18n "topics.bulk.clear_all"}}</button>
+      </span>
+    {{/if ~}}
   {{/if ~}}
   {{view.localizedName}}
   {{~#if view.isSorting}}
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
index e5d1f506d6d..2faae1a5d61 100644
--- a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
@@ -1,9 +1,11 @@
 {{#if bulkSelectEnabled}}
   <th class='star'>
-    <button class='btn bulk-select' title='{{i18n "topics.bulk.toggle"}}'><i class='fa fa-list'></i></button>
+    {{#if canBulkSelect}}
+      <button class='btn bulk-select' title='{{i18n "topics.bulk.toggle"}}'><i class='fa fa-list'></i></button>
+    {{/if}}
   </th>
 {{/if}}
-{{raw "topic-list-header-column" order='default' name='topic.title' bulkSelectEnabled=bulkSelectEnabled showBulkToggle=toggleInTitle}}
+{{raw "topic-list-header-column" order='default' name='topic.title' bulkSelectEnabled=bulkSelectEnabled showBulkToggle=toggleInTitle canBulkSelect=canBulkSelect}}
 {{#unless hideCategory}}
   {{raw "topic-list-header-column" sortable=sortable order='category' name='category_title'}}
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
index 6ce1c117058..355e4aee776 100644
--- a/app/assets/javascripts/discourse/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
@@ -3,10 +3,8 @@
                      hideCategory=hideCategory
                      showParticipants=showParticipants
                      showPosters=showPosters
-                     canBulkSelect=canBulkSelect
                      bulkSelectEnabled=bulkSelectEnabled
-                     selected=selected
-                     skipHeader=true}}
+                     selected=selected}}
 
   {{conditional-loading-spinner condition=model.loadingMore}}
 {{/load-more}}