diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts
index f0b80e3d..b8e1646c 100644
--- a/styles/src/base_layers.ts
+++ b/styles/src/base_layers.ts
@@ -21,7 +21,7 @@ export function nolabels_layers(
     {
       id: "earth",
       type: "fill",
-      filter: ["==", ["geometry-type"], "Polygon"],
+      filter: ["==", "$type", "Polygon"],
       source: source,
       "source-layer": "earth",
       paint: {
@@ -253,7 +253,7 @@ export function nolabels_layers(
     {
       id: "water",
       type: "fill",
-      filter: ["==", ["geometry-type"], "Polygon"],
+      filter: ["==", "$type", "Polygon"],
       source: source,
       "source-layer": "water",
       paint: {