diff --git a/atst/app.py b/atst/app.py
index beb584ba..2f27b661 100644
--- a/atst/app.py
+++ b/atst/app.py
@@ -73,9 +73,6 @@ def make_app(config):
     if ENV != "prod":
         app.register_blueprint(dev_routes)
 
-    if ENV == "dev":
-        app.config["SQLALCHEMY_ECHO"] = True
-
     app.form_cache = FormCache(app.redis)
 
     apply_authentication(app)
@@ -135,6 +132,7 @@ def map_config(config):
         **config["default"],
         "ENV": config["default"]["ENVIRONMENT"],
         "DEBUG": config["default"].getboolean("DEBUG"),
+        "SQLALCHEMY_ECHO": config["default"].getboolean("DEBUG"),
         "CLASSIFIED": config["default"].getboolean("CLASSIFIED"),
         "PORT": int(config["default"]["PORT"]),
         "SQLALCHEMY_DATABASE_URI": config["default"]["DATABASE_URI"],