diff --git a/models/org_team.go b/models/org_team.go
index 8ba5d2742d..c33857a411 100644
--- a/models/org_team.go
+++ b/models/org_team.go
@@ -265,6 +265,10 @@ func (t *Team) AddRepository(repo *Repository) (err error) {
 }
 
 func (t *Team) removeRepository(e Engine, repo *Repository, recalculate bool) (err error) {
+	if t.IncludesAllRepositories {
+		return nil
+	}
+
 	if err = removeTeamRepo(e, t.ID, repo.ID); err != nil {
 		return err
 	}
@@ -312,10 +316,6 @@ func (t *Team) RemoveRepository(repoID int64) error {
 		return nil
 	}
 
-	if t.IncludesAllRepositories {
-		return nil
-	}
-
 	repo, err := GetRepositoryByID(repoID)
 	if err != nil {
 		return err