diff --git a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
index 9dbe65a4ef2..bd924882713 100644
--- a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
@@ -4,14 +4,17 @@ import showModal from 'discourse/lib/show-modal';
 
 function initializePollUIBuilder(api) {
   api.modifyClass('controller:composer', {
-    @computed('siteSettings.poll_enabled', 'siteSettings.poll_minimum_trust_level_to_create')
-    canBuildPoll(pollEnabled, minimumTrustLevel) {
+    @computed('siteSettings.poll_enabled', 'siteSettings.poll_minimum_trust_level_to_create', 'model.topic.pm_with_non_human_user')
+    canBuildPoll(pollEnabled, minimumTrustLevel, pmWithNonHumanUser) {
       return pollEnabled &&
-             this.currentUser &&
-             (
-               this.currentUser.staff ||
-               this.currentUser.trust_level >= minimumTrustLevel
-             );
+        (
+          pmWithNonHumanUser ||
+          this.currentUser &&
+          (
+            this.currentUser.staff ||
+            this.currentUser.trust_level >= minimumTrustLevel
+          )
+        );
     },
 
     actions: {