diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go
index 46d8510143..861effd0b0 100644
--- a/services/auth/oauth2.go
+++ b/services/auth/oauth2.go
@@ -27,6 +27,9 @@ var (
 
 // CheckOAuthAccessToken returns uid of user from oauth token
 func CheckOAuthAccessToken(ctx context.Context, accessToken string) int64 {
+	if !setting.OAuth2.Enabled {
+		return 0
+	}
 	// JWT tokens require a "."
 	if !strings.Contains(accessToken, ".") {
 		return 0