diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go
index d14aefb09..241ba7445 100644
--- a/routers/api/v1/repo/cloudbrain_dashboard.go
+++ b/routers/api/v1/repo/cloudbrain_dashboard.go
@@ -584,12 +584,20 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 		if ciTasks[i].Repo != nil {
 			taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name
 		}
-		WaitTimeInt := time.Now().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()
-		taskDetail.WaitTime = models.ConvertDurationToStr(WaitTimeInt)
-
-		if WaitTimeInt < 0 {
-			taskDetail.WaitTime = "00:00:00"
+		if ciTasks[i].Cloudbrain.Status == string(models.JobWaiting) {
+			WaitTimeInt := time.Now().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()
+			taskDetail.WaitTime = models.ConvertDurationToStr(WaitTimeInt)
+			if WaitTimeInt < 0 {
+				taskDetail.WaitTime = "00:00:00"
+			}
+		} else {
+			WaitTimeInt := ciTasks[i].Cloudbrain.StartTime.AsTime().Unix() - ciTasks[i].Cloudbrain.CreatedUnix.AsTime().Unix()
+			taskDetail.WaitTime = models.ConvertDurationToStr(WaitTimeInt)
+			if WaitTimeInt < 0 {
+				taskDetail.WaitTime = "00:00:00"
+			}
 		}
+
 		if ciTasks[i].Cloudbrain.Type == models.TypeCloudBrainTwo || (ciTasks[i].Cloudbrain.Type == models.TypeCloudBrainOne && ciTasks[i].Cloudbrain.JobType == "TRAIN") {
 			taskDetail.JobID = ciTasks[i].Cloudbrain.JobID
 		}
@@ -1057,9 +1065,12 @@ func getBrainEndTime(rs *models.CloudbrainInfo) string {
 
 }
 func getBrainWaitTime(rs *models.CloudbrainInfo) string {
+	// if rs.Cloudbrain.Status == string(models.JobWaiting){
+	// 	waitTime := rs.Cloudbrain.
+	// }
 	waitTime := rs.Cloudbrain.StartTime - rs.Cloudbrain.CreatedUnix
 	if waitTime <= 0 {
-		return "0"
+		return "00:00:00"
 	} else {
 		return models.ConvertDurationToStr(int64(waitTime))
 	}