diff --git a/influxdb/files/influxdb.conf b/influxdb/files/influxdb.conf
index 7bb54f5..26477fe 100644
--- a/influxdb/files/influxdb.conf
+++ b/influxdb/files/influxdb.conf
@@ -66,7 +66,7 @@
 
   # Whether queries should be logged before execution. Very useful for troubleshooting, but will
   # log any sensitive data contained within a query.
-  # query-log-enabled = true
+  query-log-enabled = {{ server.data.query_log_enabled | lower }}
 
   # Settings for the TSM engine
 
diff --git a/influxdb/map.jinja b/influxdb/map.jinja
index 43dc827..913714d 100644
--- a/influxdb/map.jinja
+++ b/influxdb/map.jinja
@@ -26,6 +26,7 @@
     enabled: true
     dir: '/var/lib/influxdb/data'
     wal_dir: '/var/lib/influxdb/wal'
+    query_log_enabled: false
   meta:
     enabled: true
     dir: '/var/lib/influxdb/meta'