diff --git a/gxspringboot/pom.xml b/gxspringboot/pom.xml
index 0267fc5cd..13420c1e4 100644
--- a/gxspringboot/pom.xml
+++ b/gxspringboot/pom.xml
@@ -18,6 +18,12 @@
 			<groupId>${project.groupId}</groupId>
 			<artifactId>gxclassR</artifactId>
 			<version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>gxwrapperjavax</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/gxspringboot/src/main/java/com/genexus/springboot/GXConfig.java b/gxspringboot/src/main/java/com/genexus/springboot/GXConfig.java
index 83602a855..7a74b9fd0 100644
--- a/gxspringboot/src/main/java/com/genexus/springboot/GXConfig.java
+++ b/gxspringboot/src/main/java/com/genexus/springboot/GXConfig.java
@@ -4,6 +4,7 @@
 import com.genexus.common.interfaces.SpecificImplementation;
 import com.genexus.diagnostics.core.ILogger;
 import com.genexus.diagnostics.core.LogManager;
+import com.genexus.servlet.CorsFilter;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -51,6 +52,15 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		}
 	}
 
+	@Bean
+	public FilterRegistrationBean<CorsFilter> corsFilter() {
+		FilterRegistrationBean<CorsFilter> registrationBean = new FilterRegistrationBean<>();
+		registrationBean.setFilter(new CorsFilter());
+		registrationBean.addUrlPatterns("/*");
+		return registrationBean;
+	}
+
+
 	@Bean
 	public FilterRegistrationBean<UrlRewriteFilter> urlRewriteFilter() {
 		FilterRegistrationBean<UrlRewriteFilter> registrationBean = new FilterRegistrationBean<>();