diff --git a/packages/lambda-tiler/src/routes/tile.style.json.ts b/packages/lambda-tiler/src/routes/tile.style.json.ts
index 7b2e48336..7eea60335 100644
--- a/packages/lambda-tiler/src/routes/tile.style.json.ts
+++ b/packages/lambda-tiler/src/routes/tile.style.json.ts
@@ -280,6 +280,8 @@ export async function styleJsonGet(req: LambdaHttpRequest<StyleGet>): Promise<La
   const dbId = config.Style.id(styleName);
   const styleConfig = await config.Style.get(dbId);
 
+  req.set('styleConfig', { terrain, labels });
+
   if (styleConfig == null) {
     // Were we given a tileset name instead, generated
     const tileSet = await config.TileSet.get(config.TileSet.id(styleName));
diff --git a/packages/landing/src/components/map.label.tsx b/packages/landing/src/components/map.label.tsx
index a43a6adbc..0bcd86913 100644
--- a/packages/landing/src/components/map.label.tsx
+++ b/packages/landing/src/components/map.label.tsx
@@ -1,6 +1,6 @@
 import { IControl } from 'maplibre-gl';
 
-import { Config } from '../config.js';
+import { Config, GaEvent, gaEvent } from '../config.js';
 
 const LabelsDisabledLayers = new Set(['topographic', 'topolite']);
 
@@ -42,7 +42,9 @@ export class MapLabelControl implements IControl {
   }
 
   toggleLabels = (): void => {
-    Config.map.setLabels(!Config.map.labels);
+    const labelState = !Config.map.labels;
+    gaEvent(GaEvent.Ui, `labels:${labelState}`);
+    Config.map.setLabels(labelState);
   };
 
   updateLabelIcon = (): void => {