diff --git a/pkg/models/project.go b/pkg/models/project.go
index 7b5f17b6c..64f46148c 100644
--- a/pkg/models/project.go
+++ b/pkg/models/project.go
@@ -918,10 +918,11 @@ func CreateProject(s *xorm.Session, project *Project, auth web.Auth, createBackl
 		}
 	}
 
-	return events.Dispatch(&ProjectCreatedEvent{
+	events.DispatchOnCommit(s, &ProjectCreatedEvent{
 		Project: project,
 		Doer:    doer,
 	})
+	return nil
 }
 
 // CreateNewProjectForUser creates a new inbox project for a user. To prevent import cycles, we can't do that
@@ -1018,13 +1019,10 @@ func UpdateProject(s *xorm.Session, project *Project, auth web.Auth, updateProje
 		return err
 	}
 
-	err = events.Dispatch(&ProjectUpdatedEvent{
+	events.DispatchOnCommit(s, &ProjectUpdatedEvent{
 		Project: project,
 		Doer:    auth,
 	})
-	if err != nil {
-		return err
-	}
 
 	l, err := GetProjectSimpleByID(s, project.ID)
 	if err != nil {
@@ -1252,13 +1250,10 @@ func (p *Project) Delete(s *xorm.Session, a web.Auth) (err error) {
 		return
 	}
 
-	err = events.Dispatch(&ProjectDeletedEvent{
+	events.DispatchOnCommit(s, &ProjectDeletedEvent{
 		Project: fullProject,
 		Doer:    a,
 	})
-	if err != nil {
-		return
-	}
 
 	childProjects := []*Project{}
 	err = s.Where("parent_project_id = ?", fullProject.ID).Find(&childProjects)
diff --git a/pkg/models/project_team.go b/pkg/models/project_team.go
index 0a7016d68..f67a1fb26 100644
--- a/pkg/models/project_team.go
+++ b/pkg/models/project_team.go
@@ -109,14 +109,11 @@ func (tl *TeamProject) Create(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	err = events.Dispatch(&ProjectSharedWithTeamEvent{
+	events.DispatchOnCommit(s, &ProjectSharedWithTeamEvent{
 		Project: l,
 		Team:    team,
 		Doer:    a,
 	})
-	if err != nil {
-		return err
-	}
 
 	err = updateProjectLastUpdated(s, l)
 	return
diff --git a/pkg/models/project_users.go b/pkg/models/project_users.go
index 4d8096858..7db2f8b0f 100644
--- a/pkg/models/project_users.go
+++ b/pkg/models/project_users.go
@@ -115,14 +115,11 @@ func (lu *ProjectUser) Create(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	err = events.Dispatch(&ProjectSharedWithUserEvent{
+	events.DispatchOnCommit(s, &ProjectSharedWithUserEvent{
 		Project: l,
 		User:    u,
 		Doer:    a,
 	})
-	if err != nil {
-		return err
-	}
 
 	err = updateProjectLastUpdated(s, l)
 	return