diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 8019c3075..8f0fa8eac 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -65,6 +65,7 @@ services:
 
       TZ: "${TZ}"
       DEBUG: "true"
+      DEBUG_SQL: "false"
       # to allow automatic initialisation of collectors/presenters/publishers
       COLLECTOR_PRESENTER_PUBLISHER_API_KEY: "${COLLECTOR_PRESENTER_PUBLISHER_API_KEY}"
     labels:
diff --git a/src/core/config.py b/src/core/config.py
index 7b6c6bf8d..e824d5d06 100755
--- a/src/core/config.py
+++ b/src/core/config.py
@@ -14,7 +14,7 @@ class Config(object):
     SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{user}:{pw}@{url}/{db}'.format(user=DB_USER, pw=DB_PASSWORD,
                                                                                     url=DB_URL, db=DB_DATABASE)
     SQLALCHEMY_TRACK_MODIFICATIONS = False
-    #SQLALCHEMY_ECHO = True             # DEBUG SQL Queries
+    SQLALCHEMY_ECHO = (os.getenv("DEBUG_SQL", "false").lower() == "true") # DEBUG SQL Queries
 
     if "DB_POOL_SIZE" in os.environ:
         DB_POOL_SIZE = os.getenv("DB_POOL_SIZE")