diff --git a/services/repository/create.go b/services/repository/create.go
index 77cea3ef00..da39d20801 100644
--- a/services/repository/create.go
+++ b/services/repository/create.go
@@ -266,7 +266,7 @@ func CreateRepositoryDirectly(ctx context.Context, doer, owner *user_model.User,
 	defer func() {
 		if err != nil {
 			// we can not use the ctx because it maybe canceled or timeout
-			cleanupRepository(repo.ID)
+			cleanupRepository(repo)
 		}
 	}()
 
@@ -461,17 +461,11 @@ func createRepositoryInDB(ctx context.Context, doer, u *user_model.User, repo *r
 	return nil
 }
 
-func cleanupRepository(repoID int64) {
+func cleanupRepository(repo *repo_model.Repository) {
 	ctx := graceful.GetManager().ShutdownContext()
-	if errDelete := DeleteRepositoryDirectly(ctx, repoID); errDelete != nil {
+	if errDelete := DeleteRepositoryDirectly(ctx, repo.ID); errDelete != nil {
 		log.Error("cleanupRepository failed: %v", errDelete)
-		// Try to get repository name for better error message
-		repoIdentifier := fmt.Sprintf("[%d]", repoID)
-		if repo, err := repo_model.GetRepositoryByID(ctx, repoID); err == nil {
-			repoIdentifier = fmt.Sprintf("(%s)", repo.FullName())
-		}
-		// add system notice
-		if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when cleanup repository %s: %v", repoIdentifier, errDelete); err != nil {
+		if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when cleanup repository (%s)", repo.FullName(), errDelete); err != nil {
 			log.Error("CreateRepositoryNotice: %v", err)
 		}
 	}
diff --git a/services/repository/fork.go b/services/repository/fork.go
index f92af65605..f74e95887b 100644
--- a/services/repository/fork.go
+++ b/services/repository/fork.go
@@ -124,7 +124,7 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
 	defer func() {
 		if err != nil {
 			// we can not use the ctx because it maybe canceled or timeout
-			cleanupRepository(repo.ID)
+			cleanupRepository(repo)
 		}
 	}()
 
diff --git a/services/repository/template.go b/services/repository/template.go
index 7444bf7b60..fa89e4b020 100644
--- a/services/repository/template.go
+++ b/services/repository/template.go
@@ -101,7 +101,7 @@ func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templ
 	defer func() {
 		if err != nil {
 			// we can not use the ctx because it maybe canceled or timeout
-			cleanupRepository(generateRepo.ID)
+			cleanupRepository(generateRepo)
 		}
 	}()