diff --git a/http/influxdb/source_proxy_query_service.go b/http/influxdb/source_proxy_query_service.go
index 0781fe66aa..5c647698f3 100644
--- a/http/influxdb/source_proxy_query_service.go
+++ b/http/influxdb/source_proxy_query_service.go
@@ -18,7 +18,6 @@ import (
 	"github.com/influxdata/influxdb/kit/tracing"
 	"github.com/influxdata/influxdb/query"
 	"github.com/influxdata/influxdb/query/influxql"
-	"github.com/opentracing/opentracing-go"
 )
 
 type SourceProxyQueryService struct {
diff --git a/http/source_proxy_service.go b/http/source_proxy_service.go
index a3ea1f3054..1aa042eace 100644
--- a/http/source_proxy_service.go
+++ b/http/source_proxy_service.go
@@ -18,7 +18,6 @@ import (
 	"github.com/influxdata/influxdb/kit/tracing"
 	"github.com/influxdata/influxdb/query"
 	"github.com/influxdata/influxdb/query/influxql"
-	"github.com/opentracing/opentracing-go"
 )
 
 type SourceProxyQueryService struct {
diff --git a/query/logging.go b/query/logging.go
index 3dcf642ba8..049f80f7bf 100644
--- a/query/logging.go
+++ b/query/logging.go
@@ -59,7 +59,7 @@ func (s *LoggingServiceBridge) Query(ctx context.Context, w io.Writer, req *Prox
 	}
 	// The results iterator may have had an error independent of encoding errors.
 	if err = results.Err(); err != nil {
-		return 0, tracing.LogError(span, err)
+		return n, tracing.LogError(span, err)
 	}
 	return stats, nil
 }