diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
index 85eb942f6ee..484935a7a92 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -16,7 +16,7 @@ export function buildManageButtons(attrs, currentUser) {
   }
 
   let contents = [];
-  if (attrs.canManage) {
+  if (currentUser.staff) {
     contents.push({
       icon: 'list',
       label: 'admin.flags.moderation_history',
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
index b8299f26d71..bd24b598400 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -185,11 +185,13 @@ export default createWidget('topic-admin-menu', {
                      label: isPrivateMessage ? 'actions.make_public' : 'actions.make_private' });
     }
 
-    buttons.push({
-      action: 'showModerationHistory',
-      icon: 'list',
-      fullLabel: 'admin.flags.moderation_history'
-    });
+    if (this.currentUser.get('staff')) {
+      buttons.push({
+        action: 'showModerationHistory',
+        icon: 'list',
+        fullLabel: 'admin.flags.moderation_history'
+      });
+    }
 
     const extraButtons = applyDecorators(this, 'adminMenuButtons', this.attrs, this.state);