diff --git a/utils.go b/utils.go
index 8b1879e..f413370 100644
--- a/utils.go
+++ b/utils.go
@@ -301,7 +301,8 @@ func (b *BuildManager) buildQueue(queue []*ProtoPackage, ctx context.Context) er
 }
 
 func genQueue() ([]*ProtoPackage, error) {
-	pkgs, err := db.DbPackage.Query().Where(dbpackage.StatusEQ(dbpackage.StatusQueued)).All(context.Background())
+	pkgs, err := db.DbPackage.Query().Where(dbpackage.Or(dbpackage.StatusEQ(dbpackage.StatusQueued),
+		dbpackage.StatusEQ(dbpackage.StatusBuild), dbpackage.StatusEQ(dbpackage.StatusBuilding))).All(context.Background())
 	if err != nil {
 		return nil, err
 	}