diff --git a/kayenta-web/src/main/java/com/netflix/kayenta/config/WebConfiguration.java b/kayenta-web/src/main/java/com/netflix/kayenta/config/WebConfiguration.java
index 7b0de3692..b5727cd3d 100644
--- a/kayenta-web/src/main/java/com/netflix/kayenta/config/WebConfiguration.java
+++ b/kayenta-web/src/main/java/com/netflix/kayenta/config/WebConfiguration.java
@@ -17,12 +17,16 @@
 package com.netflix.kayenta.config;
 
 import com.google.common.collect.ImmutableList;
+import com.netflix.kayenta.filters.KayentaCorsFilter;
 import com.netflix.kayenta.interceptors.MetricsInterceptor;
 import com.netflix.spectator.api.Registry;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
@@ -45,4 +49,11 @@ public void addInterceptors(InterceptorRegistry registry) {
       )
     );
   }
+
+  @Bean
+  FilterRegistrationBean simpleCORSFilter() {
+    FilterRegistrationBean frb = new FilterRegistrationBean(new KayentaCorsFilter());
+    frb.setOrder(Ordered.HIGHEST_PRECEDENCE);
+    return frb;
+  }
 }
diff --git a/kayenta-web/src/main/java/com/netflix/kayenta/filters/KayentaCorsFilter.java b/kayenta-web/src/main/java/com/netflix/kayenta/filters/KayentaCorsFilter.java
new file mode 100644
index 000000000..c8ad8702c
--- /dev/null
+++ b/kayenta-web/src/main/java/com/netflix/kayenta/filters/KayentaCorsFilter.java
@@ -0,0 +1,31 @@
+package com.netflix.kayenta.filters;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class KayentaCorsFilter implements Filter {
+
+  public KayentaCorsFilter() {}
+
+  @Override
+  public void init(FilterConfig filterConfig) throws ServletException {}
+
+  @Override
+  public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
+    HttpServletResponse response = (HttpServletResponse) res;
+    HttpServletRequest request = (HttpServletRequest) req;
+    String origin = request.getHeader("Origin");
+    if (origin != null && origin.length() > 0) {
+      response.setHeader("Access-Control-Allow-Origin", origin);
+      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT, PATCH");
+      response.setHeader("Access-Control-Max-Age", "3600");
+      response.setHeader("Access-Control-Allow-Headers", "x-requested-with, content-type");
+    }
+    chain.doFilter(req, res);
+  }
+
+  @Override
+  public void destroy() {}
+}