diff --git a/services/bots/bots.go b/services/bots/bots.go
index d96e57830b..3d5a0f212f 100644
--- a/services/bots/bots.go
+++ b/services/bots/bots.go
@@ -91,9 +91,7 @@ func CreateCommitStatus(ctx context.Context, job *bots_model.BotRunJob) error {
 	ctxname := job.Name
 	state := toCommitStatus(job.Status)
 
-	if statuses, _, err := git_model.GetLatestCommitStatus(ctx, repo.ID, sha, db.ListOptions{}); err != nil {
-		return fmt.Errorf("GetLatestCommitStatus: %w", err)
-	} else {
+	if statuses, _, err := git_model.GetLatestCommitStatus(ctx, repo.ID, sha, db.ListOptions{}); err == nil {
 		for _, v := range statuses {
 			if v.Context == ctxname {
 				if v.State == state {
@@ -102,6 +100,8 @@ func CreateCommitStatus(ctx context.Context, job *bots_model.BotRunJob) error {
 				break
 			}
 		}
+	} else {
+		return fmt.Errorf("GetLatestCommitStatus: %w", err)
 	}
 
 	if err := git_model.NewCommitStatus(git_model.NewCommitStatusOptions{
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index b1a5121010..861f02f960 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -420,7 +420,7 @@
 					</div>
 				</div>
 
-				{{if .EnableBots }}
+				{{if .EnableBots}}
 					{{$isBotsEnabled := .Repository.UnitEnabled $.UnitTypeBots}}
 					<div class="inline field">
 						<label>{{.locale.Tr "repo.bots"}}</label>