diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/annotation/builders/ClientDetailsServiceBuilder.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/annotation/builders/ClientDetailsServiceBuilder.java
index 91e229e10..e9cf37163 100644
--- a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/annotation/builders/ClientDetailsServiceBuilder.java
+++ b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/annotation/builders/ClientDetailsServiceBuilder.java
@@ -113,6 +113,8 @@ private ClientDetails build() {
 			result.setResourceIds(resourceIds);
 			if (autoApprove) {
 				result.setAutoApproveScopes(scopes);
+			} else {
+				result.setAutoApproveScopes(autoApproveScopes);
 			}
 			return result;
 		}