diff --git a/ckan/config/middleware/flask_app.py b/ckan/config/middleware/flask_app.py
index 6a3e80b4369..2bbb4939354 100644
--- a/ckan/config/middleware/flask_app.py
+++ b/ckan/config/middleware/flask_app.py
@@ -32,6 +32,12 @@ def hello_world():
     def hello_world_post():
         return 'Hello World, this was posted to Flask'
 
+    # Update the main CKAN config object with the Flask specific keys
+    # that were set here or autogenerated
+    flask_config_keys = set(flask_app.config.keys()) - set(config.keys())
+    for key in flask_config_keys:
+        config[key] = flask_app.config[key]
+
     # Add a reference to the actual Flask app so it's easier to access
     app._wsgi_app = flask_app