diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 5acff8721..0bc4fa3bd 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -1133,7 +1133,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     provisioningEnvironment.jersey().register(new KeepAliveController(pubSubClientEventManager));
     provisioningEnvironment.jersey().register(new TimestampResponseFilter());
 
-    registerCorsFilter(environment);
     registerExceptionMappers(environment, webSocketEnvironment, provisioningEnvironment);
 
     environment.jersey().property(ServerProperties.UNWRAP_COMPLETION_STAGE_IN_WRITER_ENABLE, Boolean.TRUE);
@@ -1191,16 +1190,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     });
   }
 
-  private void registerCorsFilter(Environment environment) {
-    FilterRegistration.Dynamic filter = environment.servlets().addFilter("CORS", CrossOriginFilter.class);
-    filter.addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), true, "/*");
-    filter.setInitParameter("allowedOrigins", "*");
-    filter.setInitParameter("allowedHeaders", "Content-Type,Authorization,X-Requested-With,Content-Length,Accept,Origin,X-Signal-Agent");
-    filter.setInitParameter("allowedMethods", "GET,PUT,POST,DELETE,OPTIONS");
-    filter.setInitParameter("preflightMaxAge", "5184000");
-    filter.setInitParameter("allowCredentials", "true");
-  }
-
   public static void main(String[] args) throws Exception {
     new WhisperServerService().run(args);
   }