diff --git a/pkg/models/teams.go b/pkg/models/teams.go
index 67932dba7..7e5dc149e 100644
--- a/pkg/models/teams.go
+++ b/pkg/models/teams.go
@@ -131,17 +131,18 @@ func GetTeamByID(s *xorm.Session, id int64) (team *Team, err error) {
 
 // GetTeamByOidcIDAndName gets teams where oidc_id and name match parameters
 // For oidc team creation oidcID and Name need to be set
-func GetTeamByOidcIDAndName(s *xorm.Session, oidcID string, teamName string) (team Team, err error) {
+func GetTeamByOidcIDAndName(s *xorm.Session, oidcID string, teamName string) (*Team, error) {
+	team := &Team{}
 	has, err := s.
 		Table("teams").
 		Where("oidc_id = ? AND name = ?", oidcID, teamName).
 		Asc("id").
 		Limit(1).
-		Get(&team)
+		Get(team)
 	if !has || err != nil {
-		return team, ErrOIDCTeamDoesNotExist{teamName, oidcID}
+		return nil, ErrOIDCTeamDoesNotExist{teamName, oidcID}
 	}
-	return team, err
+	return team, nil
 }
 
 func FindAllOidcTeamIDsForUser(s *xorm.Session, userID int64) (ts []int64, err error) {