diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
index 8cd49275223a98..d8f60b51fe2088 100644
--- a/src/sentry/conf/server.py
+++ b/src/sentry/conf/server.py
@@ -362,7 +362,11 @@
 BROKER_URL = "django://"
 BROKER_TRANSPORT_OPTIONS = {}
 
-CELERY_ALWAYS_EAGER = True
+# Ensure workers run async by default
+# in Development you might want them to run in-process
+# though it would cause timeouts/recursions in some cases
+CELERY_ALWAYS_EAGER = False
+
 CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
 CELERY_IGNORE_RESULT = True
 CELERY_SEND_EVENTS = False
diff --git a/src/sentry/runner/settings.py b/src/sentry/runner/settings.py
index 44775417d42a1a..9e1b5a1575e05f 100644
--- a/src/sentry/runner/settings.py
+++ b/src/sentry/runner/settings.py
@@ -95,7 +95,6 @@
 # information on configuring your queue broker and workers. Sentry relies
 # on a Python framework called Celery to manage queues.
 
-CELERY_ALWAYS_EAGER = False
 BROKER_URL = 'redis://localhost:6379'
 
 ###############