diff --git a/routers/web/repo/builds/view.go b/routers/web/repo/builds/view.go
index df97588b6b..ad53db9420 100644
--- a/routers/web/repo/builds/view.go
+++ b/routers/web/repo/builds/view.go
@@ -133,8 +133,9 @@ func ViewPost(ctx *context.Context) {
 		}
 
 		resp.StateData.CurrentJobInfo.Title = current.Name
+		resp.StateData.CurrentJobSteps = make([]ViewJobStep, 0)
 		resp.LogsData.StreamingLogs = make([]ViewStepLog, 0, len(req.StepLogCursors))
-		if current.TaskID == 0 {
+		if task == nil {
 			resp.StateData.CurrentJobInfo.Detail = "wait to be pick up by a runner"
 		} else {
 			resp.StateData.CurrentJobInfo.Detail = "TODO: more detail info" // TODO: more detail info
diff --git a/web_src/js/components/RepoBuildView.vue b/web_src/js/components/RepoBuildView.vue
index de791887c3..e4430837fa 100644
--- a/web_src/js/components/RepoBuildView.vue
+++ b/web_src/js/components/RepoBuildView.vue
@@ -14,6 +14,7 @@
             <SvgIcon name="octicon-check-circle-fill" class="green" v-if="job.status === 'success'"/>
             <SvgIcon name="octicon-skip" class="ui text grey" v-else-if="job.status === 'skipped'"/>
             <SvgIcon name="octicon-clock" class="ui text yellow" v-else-if="job.status === 'waiting'"/>
+            <SvgIcon name="octicon-blocked" class="ui text yellow" v-else-if="job.status === 'blocked'"/>
             <SvgIcon name="octicon-meter" class="ui text yellow" class-name="job-status-rotate" v-else-if="job.status === 'running'"/>
             <SvgIcon name="octicon-x-circle-fill" class="red" v-else/>
             {{ job.name }}
diff --git a/web_src/js/svg.js b/web_src/js/svg.js
index 592118827d..0a7a226fc9 100644
--- a/web_src/js/svg.js
+++ b/web_src/js/svg.js
@@ -28,6 +28,7 @@ import octiconCheckCircleFill from '../../public/img/svg/octicon-check-circle-fi
 import octiconXCircleFill from '../../public/img/svg/octicon-x-circle-fill.svg';
 import octiconSkip from '../../public/img/svg/octicon-skip.svg';
 import octiconMeter from '../../public/img/svg/octicon-meter.svg';
+import octiconBlocked from '../../public/img/svg/octicon-blocked.svg';
 
 
 export const svgs = {
@@ -61,6 +62,7 @@ export const svgs = {
   'octicon-x-circle-fill': octiconXCircleFill,
   'octicon-skip': octiconSkip,
   'octicon-meter': octiconMeter,
+  'octicon-blocked': octiconBlocked,
 };