diff --git a/server/service/handler.go b/server/service/handler.go
index d9f7753705..02c5f7867a 100644
--- a/server/service/handler.go
+++ b/server/service/handler.go
@@ -334,6 +334,7 @@ func makeKolideKitHandlers(e KolideEndpoints, opts []kithttp.ServerOption) *koli
 func MakeHandler(svc kolide.Service, jwtKey string, logger kitlog.Logger) http.Handler {
 	kolideAPIOptions := []kithttp.ServerOption{
 		kithttp.ServerBefore(
+			kithttp.PopulateRequestContext, // populate the request context with common fields
 			setRequestsContexts(svc, jwtKey),
 		),
 		kithttp.ServerErrorLogger(logger),
diff --git a/server/service/logging_osquery.go b/server/service/logging_osquery.go
index e2c1bcf3b3..6e5449cd0a 100644
--- a/server/service/logging_osquery.go
+++ b/server/service/logging_osquery.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	kithttp "github.com/go-kit/kit/transport/http"
 	"github.com/kolide/fleet/server/kolide"
 )
 
@@ -16,6 +17,7 @@ func (mw loggingMiddleware) EnrollAgent(ctx context.Context, enrollSecret string
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "EnrollAgent",
+			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -34,6 +36,7 @@ func (mw loggingMiddleware) AuthenticateHost(ctx context.Context, nodeKey string
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "AuthenticateHost",
+			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -52,6 +55,7 @@ func (mw loggingMiddleware) GetClientConfig(ctx context.Context) (*kolide.Osquer
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "GetClientConfig",
+			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -71,6 +75,7 @@ func (mw loggingMiddleware) GetDistributedQueries(ctx context.Context) (map[stri
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "GetDistributedQueries",
+			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -88,6 +93,7 @@ func (mw loggingMiddleware) SubmitDistributedQueryResults(ctx context.Context, r
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "SubmitDistributedQueryResults",
+			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -105,6 +111,7 @@ func (mw loggingMiddleware) SubmitStatusLogs(ctx context.Context, logs []kolide.
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "SubmitStatusLogs",
+			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -122,6 +129,7 @@ func (mw loggingMiddleware) SubmitResultLogs(ctx context.Context, logs []kolide.
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "SubmitResultLogs",
+			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)