diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9386f8bd62..7a9deb8ca7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 - [#6604](https://github.com/influxdata/influxdb/pull/6604): Remove old cluster code
 - [#6618](https://github.com/influxdata/influxdb/pull/6618): Optimize shard loading
+- [#6629](https://github.com/influxdata/influxdb/issues/6629): query-log-enabled in config not ignored anymore.
 
 ## v0.13.0 [2016-05-12]
 
diff --git a/cmd/influxd/run/server.go b/cmd/influxd/run/server.go
index 33b094fac4..1b490fa6f4 100644
--- a/cmd/influxd/run/server.go
+++ b/cmd/influxd/run/server.go
@@ -183,9 +183,6 @@ func NewServer(c *Config, buildInfo *BuildInfo) (*Server, error) {
 	s.QueryExecutor.QueryTimeout = time.Duration(c.Coordinator.QueryTimeout)
 	s.QueryExecutor.LogQueriesAfter = time.Duration(c.Coordinator.LogQueriesAfter)
 	s.QueryExecutor.MaxConcurrentQueries = c.Coordinator.MaxConcurrentQueries
-	if c.Data.QueryLogEnabled {
-		s.QueryExecutor.Logger = log.New(os.Stderr, "[query] ", log.LstdFlags)
-	}
 
 	// Initialize the monitor
 	s.Monitor.Version = s.buildInfo.Version
@@ -266,7 +263,9 @@ func (s *Server) Open() error {
 	w := s.logOutput
 	s.MetaClient.SetLogOutput(w)
 	s.TSDBStore.SetLogOutput(w)
-	s.QueryExecutor.SetLogOutput(w)
+	if s.config.Data.QueryLogEnabled {
+		s.QueryExecutor.SetLogOutput(w)
+	}
 	s.PointsWriter.SetLogOutput(w)
 	s.Subscriber.SetLogOutput(w)
 	for _, svc := range s.Services {