diff --git a/ddl/rollingback.go b/ddl/rollingback.go
index e63d6fd647..f48449f53c 100644
--- a/ddl/rollingback.go
+++ b/ddl/rollingback.go
@@ -357,12 +357,6 @@ func convertJob2RollbackJob(w *worker, d *ddlCtx, t *meta.Meta, job *model.Job)
 	}
 
 	if err != nil {
-		if job.State != model.JobStateRollingback && job.State != model.JobStateCancelled {
-			logutil.Logger(w.logCtx).Error("[ddl] run DDL job failed", zap.String("job", job.String()), zap.Error(err))
-		} else {
-			logutil.Logger(w.logCtx).Info("[ddl] the DDL job is cancelled normally", zap.String("job", job.String()), zap.Error(err))
-		}
-
 		if job.Error == nil {
 			job.Error = toTError(err)
 		}
@@ -371,6 +365,15 @@ func convertJob2RollbackJob(w *worker, d *ddlCtx, t *meta.Meta, job *model.Job)
 				fmt.Sprintf("DDL job rollback, error msg: %s", job.Error.ToSQLError().Message))
 		}
 		job.ErrorCount++
+
+		if job.State != model.JobStateRollingback && job.State != model.JobStateCancelled {
+			logutil.Logger(w.logCtx).Error("[ddl] run DDL job failed", zap.String("job", job.String()), zap.Error(err))
+		} else {
+			logutil.Logger(w.logCtx).Info("[ddl] the DDL job is cancelled normally", zap.String("job", job.String()), zap.Error(err))
+			// If job is cancelled, we shouldn't return an error.
+			return ver, nil
+		}
 	}
+
 	return
 }