diff --git a/solver/llbsolver/history.go b/solver/llbsolver/history.go
index d7ca60a08936..d055a7bf54f0 100644
--- a/solver/llbsolver/history.go
+++ b/solver/llbsolver/history.go
@@ -819,7 +819,7 @@ func (h *HistoryQueue) Listen(ctx context.Context, req *controlapi.BuildHistoryR
 		}
 		h.mu.Unlock()
 		for _, e := range events {
-			if e.Record == nil {
+			if e == nil || e.Record == nil {
 				continue
 			}
 			if err := f(e); err != nil {