diff --git a/op/status.go b/op/status.go
index bed582c6..30db44ec 100644
--- a/op/status.go
+++ b/op/status.go
@@ -595,7 +595,7 @@ func GetRepairQueueStatus(ctx context.Context, inf cke.Infrastructure, n *cke.No
 
 	rqs.RepairCompleted = make(map[string]bool)
 	for _, entry := range entries {
-		if !(entry.Status == cke.RepairStatusQueued || entry.Status == cke.RepairStatusProcessing) {
+		if entry.HasFinished() {
 			// not "!(RepairStatusProcessing && repairStepStatusWatching)"
 			// Though the repair completion will happen a little later after the execution of
 			// the repair command in most cases, it is useful to check the health for all