diff --git a/internal/middleware/logger.go b/internal/middleware/logger.go
index 6fd7ce2c8..723952eec 100644
--- a/internal/middleware/logger.go
+++ b/internal/middleware/logger.go
@@ -57,7 +57,8 @@ func Logger() gin.HandlerFunc {
 
 				// Dump a stacktrace to error log
 				callers := errors.GetCallers(3, 10)
-				log.WithField("stacktrace", callers).Error(err)
+				log.WithContext(c.Request.Context()).
+					WithField("stacktrace", callers).Error(err)
 			}
 
 			// NOTE:
@@ -75,7 +76,8 @@ func Logger() gin.HandlerFunc {
 			fields[5] = kv.Field{"path", path}
 
 			// Create log entry with fields
-			l := log.WithFields(fields...)
+			l := log.WithContext(c.Request.Context()).
+				WithFields(fields...)
 
 			// Default is info
 			lvl := level.INFO