diff --git a/build/build.go b/build/build.go
index f479aa65..942753cd 100644
--- a/build/build.go
+++ b/build/build.go
@@ -920,7 +920,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 							}
 							results.Set(resultKey(dp.driverIndex, k), res)
 							if resultHandleFunc != nil {
-								resultCtx, err := NewResultContext(cc, so, res)
+								resultCtx, err := NewResultContext(ctx, cc, so, res)
 								if err == nil {
 									resultHandleFunc(dp.driverIndex, resultCtx)
 								} else {
diff --git a/build/result.go b/build/result.go
index 3d394be7..79b4fd0d 100644
--- a/build/result.go
+++ b/build/result.go
@@ -19,8 +19,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func NewResultContext(c *client.Client, solveOpt client.SolveOpt, res *gateway.Result) (*ResultContext, error) {
-	ctx := context.Background()
+func NewResultContext(ctx context.Context, c *client.Client, solveOpt client.SolveOpt, res *gateway.Result) (*ResultContext, error) {
 	def, err := getDefinition(ctx, res)
 	if err != nil {
 		return nil, err