diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 669c72956c2..c3f2f901bd3 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -309,8 +309,6 @@ after_initialize do
   end
 
   validate(:post, :validate_polls) do |force = nil|
-    return if !SiteSetting.poll_enabled? && (self.user && !self.user.staff?)
-
     # only care when raw has changed!
     return unless self.raw_changed? || force
 
diff --git a/plugins/poll/spec/lib/new_post_manager_spec.rb b/plugins/poll/spec/lib/new_post_manager_spec.rb
index 8f1a843d0bb..cf076e6a065 100644
--- a/plugins/poll/spec/lib/new_post_manager_spec.rb
+++ b/plugins/poll/spec/lib/new_post_manager_spec.rb
@@ -5,6 +5,10 @@ describe NewPostManager do
   let(:admin) { Fabricate(:admin) }
 
   describe 'when new post containing a poll is queued for approval' do
+    before do
+      SiteSetting.poll_minimum_trust_level_to_create = 0
+    end
+
     it 'should render the poll upon approval' do
       params = {
         raw: "[poll]\n* 1\n* 2\n* 3\n[/poll]",