diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index 2d141e3b1..c35326785 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -12,7 +12,12 @@ module Jobs
 
     def execute(args)
       @args = args
-      poll_pop3 if SiteSetting.pop3_polling_enabled?
+      poll_pop3 if should_poll?
+    end
+
+    def should_poll?
+      return false if Rails.env.development? && ENV["POLL_MAILBOX"].nil?
+      SiteSetting.pop3_polling_enabled?
     end
 
     def process_popmail(popmail)