diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java
index 39cf52fbe9..fc09bbe7c7 100755
--- a/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java
+++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java
@@ -51,6 +51,13 @@ public class KeycloakDeploymentBuilder {
         deployment.setPublicClient(adapterConfig.isPublicClient());
         deployment.setUseResourceRoleMappings(adapterConfig.isUseResourceRoleMappings());
 
+        if (adapterConfig.isCors()) {
+            deployment.setCors(true);
+            deployment.setCorsMaxAge(adapterConfig.getCorsMaxAge());
+            deployment.setCorsAllowedHeaders(adapterConfig.getCorsAllowedHeaders());
+            deployment.setCorsAllowedMethods(adapterConfig.getCorsAllowedMethods());
+        }
+
         if (adapterConfig.isBearerOnly()) {
             deployment.setBearerOnly(true);
             return deployment;
@@ -73,13 +80,6 @@ public class KeycloakDeploymentBuilder {
         deployment.setLogoutUrl(KeycloakUriBuilder.fromUri(logoutUrl));
         deployment.setAccountUrl(accountUrl);
 
-        if (adapterConfig.isCors()) {
-            deployment.setCors(true);
-            deployment.setCorsMaxAge(adapterConfig.getCorsMaxAge());
-            deployment.setCorsAllowedHeaders(adapterConfig.getCorsAllowedHeaders());
-            deployment.setCorsAllowedMethods(adapterConfig.getCorsAllowedMethods());
-        }
-
         return deployment;
     }