diff --git a/models/bots/build.go b/models/bots/build.go
index 5edb396583..1333fa586f 100644
--- a/models/bots/build.go
+++ b/models/bots/build.go
@@ -233,7 +233,7 @@ func (opts FindBuildOptions) toConds() builder.Cond {
 	if opts.IsClosed.IsTrue() {
 		cond = cond.And(builder.Expr("status IN (?,?,?,?)", core.StatusError, core.StatusFailing, core.StatusPassing))
 	} else if opts.IsClosed.IsFalse() {
-		cond = cond.And(builder.Expr("status IN (?,?,?)", core.StatusPending, core.StatusRunning))
+		cond = cond.And(builder.Expr("status IN (?,?,?)", core.StatusWaiting, core.StatusPending, core.StatusRunning))
 	}
 	return cond
 }
diff --git a/models/bots/build_stage.go b/models/bots/build_stage.go
index 1b8a2f389b..c6c6e12b10 100644
--- a/models/bots/build_stage.go
+++ b/models/bots/build_stage.go
@@ -52,7 +52,7 @@ func (opts FindStageOptions) toConds() builder.Cond {
 		cond = cond.And(builder.Eq{"build_id": opts.BuildID})
 	}
 	if opts.IsClosed.IsTrue() {
-		cond = cond.And(builder.Expr("status IN (?,?,?,?)", core.StatusError, core.StatusFailing, core.StatusPassing))
+		cond = cond.And(builder.Expr("status IN (?,?,?,?)", core.StatusError, core.StatusFailing, core.StatusPassing, core.StatusKilled))
 	} else if opts.IsClosed.IsFalse() {
 		cond = cond.And(builder.Expr("status IN (?,?,?)", core.StatusPending, core.StatusRunning))
 	}