diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index b239ac20d..010f0aeaf 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -70,9 +70,7 @@ Style::Style(FileSource& fileSource_, float pixelRatio)
 
 void Style::setJSON(const std::string& json, const std::string&) {
     sources.clear();
-    layers.erase(std::remove_if(layers.begin(), layers.end(), [](const auto& layer) {
-            return !layer->template is<CustomLayer>();
-        }), layers.end());
+    layers.clear();
     classes.clear();
 
     StyleParser parser;
diff --git a/test/api/custom_layer.cpp b/test/api/custom_layer.cpp
index beffa749d..4ad25bbfd 100644
--- a/test/api/custom_layer.cpp
+++ b/test/api/custom_layer.cpp
@@ -90,8 +90,4 @@ TEST(CustomLayer, Basic) {
         }, new TestLayer());
 
     test::checkImage("test/fixtures/custom_layer/basic", test::render(map));
-
-    // Custom layer should be preserved when switching styles
-    map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"), "");
-    test::checkImage("test/fixtures/custom_layer/basic", test::render(map));
 }