diff --git a/app/config.py b/app/config.py
index ab5a08b27..46413ca70 100644
--- a/app/config.py
+++ b/app/config.py
@@ -145,7 +145,7 @@ class Config(object):
     SQLALCHEMY_POOL_SIZE = int(os.environ.get('SQLALCHEMY_POOL_SIZE', 5))
     SQLALCHEMY_POOL_TIMEOUT = 30
     SQLALCHEMY_POOL_RECYCLE = 300
-    SQLALCHEMY_STATEMENT_TIMEOUT = 1200
+    SQLALCHEMY_STATEMENT_TIMEOUT = int(os.environ.get('SQLALCHEMY_STATEMENT_TIMEOUT', 1200))
     PAGE_SIZE = 50
     API_PAGE_SIZE = 250
     TEST_MESSAGE_FILENAME = 'Test message'
diff --git a/manifest.yml.j2 b/manifest.yml.j2
index b8b3a2910..09c0a5551 100644
--- a/manifest.yml.j2
+++ b/manifest.yml.j2
@@ -58,6 +58,7 @@
     'additional_env_vars': {
       'CELERYD_MAX_TASKS_PER_CHILD': 1,
       'CELERYD_PREFETCH_MULTIPLIER': 1,
+      'SQLALCHEMY_STATEMENT_TIMEOUT': 2400
     }
   },
   'notify-delivery-worker-priority': {},