diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 0ec4edb23d..b76a049300 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -65,9 +65,6 @@ CELERY_RESULT_BACKEND = 'djcelery.backends.cache:CacheBackend'
 BROKER_HEARTBEAT = 10.0
 BROKER_HEARTBEAT_CHECKRATE = 2
 
-# Message expiry time in seconds, Default is 5 seconds
-CELERY_EVENT_QUEUE_TTL = 10
-
 # Each worker should only fetch one message at a time
 CELERYD_PREFETCH_MULTIPLIER = 1
 
@@ -366,6 +363,9 @@ BROKER_URL = "{0}://{1}:{2}@{3}/{4}".format(CELERY_BROKER_TRANSPORT,
                                             CELERY_BROKER_VHOST)
 BROKER_USE_SSL = ENV_TOKENS.get('CELERY_BROKER_USE_SSL', False)
 
+# Message expiry time in seconds
+CELERY_EVENT_QUEUE_TTL = ENV_TOKENS.get('CELERY_EVENT_QUEUE_TTL', None)
+
 # Allow CELERY_QUEUES to be overwritten by ENV_TOKENS,
 ENV_CELERY_QUEUES = ENV_TOKENS.get('CELERY_QUEUES', None)
 if ENV_CELERY_QUEUES:
diff --git a/cms/envs/yaml_config.py b/cms/envs/yaml_config.py
index 0e5dbef0a7..e6968d3cbd 100644
--- a/cms/envs/yaml_config.py
+++ b/cms/envs/yaml_config.py
@@ -110,9 +110,6 @@ CELERY_RESULT_BACKEND = 'djcelery.backends.cache:CacheBackend'
 BROKER_HEARTBEAT = 10.0
 BROKER_HEARTBEAT_CHECKRATE = 2
 
-# Message expiry time in seconds, Default is 5 seconds
-CELERY_EVENT_QUEUE_TTL = 10
-
 # Each worker should only fetch one message at a time
 CELERYD_PREFETCH_MULTIPLIER = 1
 
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 1a1048044b..0ed14eda75 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -74,9 +74,6 @@ CELERY_RESULT_BACKEND = 'djcelery.backends.cache:CacheBackend'
 BROKER_HEARTBEAT = 10.0
 BROKER_HEARTBEAT_CHECKRATE = 2
 
-# Message expiry time in seconds, Default is 5 seconds
-CELERY_EVENT_QUEUE_TTL = 10
-
 # Each worker should only fetch one message at a time
 CELERYD_PREFETCH_MULTIPLIER = 1
 
@@ -265,6 +262,9 @@ BULK_EMAIL_ROUTING_KEY_SMALL_JOBS = ENV_TOKENS.get('BULK_EMAIL_ROUTING_KEY_SMALL
 # Queue to use for updating persistent grades
 RECALCULATE_GRADES_ROUTING_KEY = ENV_TOKENS.get('RECALCULATE_GRADES_ROUTING_KEY', LOW_PRIORITY_QUEUE)
 
+# Message expiry time in seconds
+CELERY_EVENT_QUEUE_TTL = ENV_TOKENS.get('CELERY_EVENT_QUEUE_TTL', None)
+
 # Allow CELERY_QUEUES to be overwritten by ENV_TOKENS,
 ENV_CELERY_QUEUES = ENV_TOKENS.get('CELERY_QUEUES', None)
 if ENV_CELERY_QUEUES:
diff --git a/lms/envs/yaml_config.py b/lms/envs/yaml_config.py
index ca099d3a2c..2d816c2f24 100644
--- a/lms/envs/yaml_config.py
+++ b/lms/envs/yaml_config.py
@@ -133,9 +133,6 @@ CELERY_RESULT_BACKEND = 'djcelery.backends.cache:CacheBackend'
 BROKER_HEARTBEAT = 10.0
 BROKER_HEARTBEAT_CHECKRATE = 2
 
-#  Message expiry time in seconds, Default is 5 seconds
-CELERY_EVENT_QUEUE_TTL = 10
-
 # Each worker should only fetch one message at a time
 CELERYD_PREFETCH_MULTIPLIER = 1