diff --git a/pkg/login/social/generic_oauth.go b/pkg/login/social/generic_oauth.go
index 887c19006d2..20efb607b5b 100644
--- a/pkg/login/social/generic_oauth.go
+++ b/pkg/login/social/generic_oauth.go
@@ -27,6 +27,7 @@ type SocialGenericOAuth struct {
 	teamIdsAttributePath string
 	teamIds              []string
 	allowedGroups        []string
+	skipOrgRoleSync      bool
 }
 
 func (s *SocialGenericOAuth) IsGroupMember(groups []string) bool {
diff --git a/pkg/login/social/social.go b/pkg/login/social/social.go
index ad18fbac6de..46f21556a73 100644
--- a/pkg/login/social/social.go
+++ b/pkg/login/social/social.go
@@ -239,6 +239,7 @@ func ProvideService(cfg *setting.Cfg,
 				teamIds:              sec.Key("team_ids").Strings(","),
 				allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()),
 				allowedGroups:        util.SplitString(sec.Key("allowed_groups").String()),
+				skipOrgRoleSync:      cfg.GenericOAuthSkipOrgRoleSync,
 			}
 		}