diff --git a/routers/api/v1/repo/status.go b/routers/api/v1/repo/status.go
index 40007ea1e5..d632d5b5e1 100644
--- a/routers/api/v1/repo/status.go
+++ b/routers/api/v1/repo/status.go
@@ -271,11 +271,7 @@ func GetCombinedCommitStatusByRef(ctx *context.APIContext) {
 	}
 	ctx.SetTotalCountHeader(count)
 
-	if len(statuses) == 0 {
-		ctx.JSON(http.StatusOK, &api.CombinedStatus{})
-		return
-	}
-
-	combiStatus := convert.ToCombinedStatus(ctx, statuses, convert.ToRepo(ctx, repo, ctx.Repo.Permission))
+	combiStatus := convert.ToCombinedStatus(ctx, refCommit.Commit.ID.String(), statuses,
+		convert.ToRepo(ctx, repo, ctx.Repo.Permission))
 	ctx.JSON(http.StatusOK, combiStatus)
 }
diff --git a/services/convert/status.go b/services/convert/status.go
index b4864a0307..fe8240a8f7 100644
--- a/services/convert/status.go
+++ b/services/convert/status.go
@@ -42,20 +42,19 @@ func ToCommitStatuses(ctx context.Context, statuses []*git_model.CommitStatus) [
 }
 
 // ToCombinedStatus converts List of CommitStatus to a CombinedStatus
-func ToCombinedStatus(ctx context.Context, statuses []*git_model.CommitStatus, repo *api.Repository) *api.CombinedStatus {
-	if len(statuses) == 0 {
-		return nil
+func ToCombinedStatus(ctx context.Context, commitID string, statuses []*git_model.CommitStatus, repo *api.Repository) *api.CombinedStatus {
+	status := api.CombinedStatus{
+		SHA:        commitID,
+		TotalCount: len(statuses),
+		Repository: repo,
+		CommitURL:  repo.URL + "/commits/" + url.PathEscape(commitID),
+		URL:        repo.URL + "/commits/" + url.PathEscape(commitID) + "/status",
 	}
 
 	combinedStatus := git_model.CalcCommitStatus(statuses)
-
-	return &api.CombinedStatus{
-		State:      combinedStatus.State,
-		Statuses:   ToCommitStatuses(ctx, statuses),
-		SHA:        combinedStatus.SHA,
-		TotalCount: len(statuses),
-		Repository: repo,
-		CommitURL:  repo.URL + "/commits/" + url.PathEscape(combinedStatus.SHA),
-		URL:        repo.URL + "/commits/" + url.PathEscape(combinedStatus.SHA) + "/status",
+	if combinedStatus != nil {
+		status.Statuses = ToCommitStatuses(ctx, statuses)
+		status.State = combinedStatus.State
 	}
+	return &status
 }