diff --git a/website/src/lib/assets/layers.ts b/website/src/lib/assets/layers.ts
index db829b63..3662c4cc 100644
--- a/website/src/lib/assets/layers.ts
+++ b/website/src/lib/assets/layers.ts
@@ -503,7 +503,7 @@ export const overlayTree: LayerTreeType = {
             cyclOSM: {
                 cyclOSMlite: true,
             },
-            strava: {
+            /*strava: {
                 stravaHeatmapRun: true,
                 stravaHeatmapTrailRun: true,
                 stravaHeatmapHike: true,
@@ -512,7 +512,7 @@ export const overlayTree: LayerTreeType = {
                 stravaHeatmapMTB: true,
                 stravaHeatmapWater: true,
                 stravaHeatmapWinter: true,
-            },
+            },*/
             waymarked_trails: {
                 waymarkedTrailsHiking: true,
                 waymarkedTrailsCycling: true,
@@ -548,7 +548,7 @@ export const defaultOverlays = {
             cyclOSM: {
                 cyclOSMlite: false,
             },
-            strava: {
+            /*strava: {
                 stravaHeatmapRun: false,
                 stravaHeatmapTrailRun: false,
                 stravaHeatmapHike: false,
@@ -557,7 +557,7 @@ export const defaultOverlays = {
                 stravaHeatmapMTB: false,
                 stravaHeatmapWater: false,
                 stravaHeatmapWinter: false,
-            },
+            },*/
             waymarked_trails: {
                 waymarkedTrailsHiking: false,
                 waymarkedTrailsCycling: false,
@@ -643,7 +643,7 @@ export const defaultOverlayTree: LayerTreeType = {
             cyclOSM: {
                 cyclOSMlite: true,
             },
-            strava: {
+            /*strava: {
                 stravaHeatmapRun: true,
                 stravaHeatmapTrailRun: true,
                 stravaHeatmapHike: true,
@@ -652,7 +652,7 @@ export const defaultOverlayTree: LayerTreeType = {
                 stravaHeatmapMTB: true,
                 stravaHeatmapWater: true,
                 stravaHeatmapWinter: true,
-            },
+            },*/
             waymarked_trails: {
                 waymarkedTrailsHiking: true,
                 waymarkedTrailsCycling: true,
@@ -678,7 +678,7 @@ export const defaultOverlayTree: LayerTreeType = {
     }
 }
 
-export const stravaHeatmapServers = ['https://proxy.nakarte.me/https/heatmap-external-a.strava.com/tiles-auth']; //['https://heatmap-external-a.strava.com/tiles-auth', 'https://heatmap-external-b.strava.com/tiles-auth', 'https://heatmap-external-c.strava.com/tiles-auth'];
+export const stravaHeatmapServers = ['https://heatmap-external-a.strava.com/tiles-auth', 'https://heatmap-external-b.strava.com/tiles-auth', 'https://heatmap-external-c.strava.com/tiles-auth'];
 export const stravaHeatmapActivityIds: { [key: string]: string } = {
     stravaHeatmapRun: 'sport_Run',
     stravaHeatmapTrailRun: 'sport_TrailRun',
diff --git a/website/src/lib/components/layer-control/LayerControlSettings.svelte b/website/src/lib/components/layer-control/LayerControlSettings.svelte
index cf523c83..868bd185 100644
--- a/website/src/lib/components/layer-control/LayerControlSettings.svelte
+++ b/website/src/lib/components/layer-control/LayerControlSettings.svelte
@@ -40,13 +40,15 @@
 		let m = get(map);
 		if (m) {
 			let currentStravaLayers = [];
-			for (let layer of Object.keys(overlayTree.overlays.world.strava)) {
-				if (m.getLayer(layer)) {
-					m.removeLayer(layer);
-					currentStravaLayers.push(layer);
-				}
-				if (m.getSource(layer)) {
-					m.removeSource(layer);
+			if (overlayTree.overlays.world.strava) {
+				for (let layer of Object.keys(overlayTree.overlays.world.strava)) {
+					if (m.getLayer(layer)) {
+						m.removeLayer(layer);
+						currentStravaLayers.push(layer);
+					}
+					if (m.getSource(layer)) {
+						m.removeSource(layer);
+					}
 				}
 			}
 			if (currentStravaLayers.length > 0) {
diff --git a/website/src/lib/stores.ts b/website/src/lib/stores.ts
index b12ecbcf..b34a3aed 100644
--- a/website/src/lib/stores.ts
+++ b/website/src/lib/stores.ts
@@ -265,7 +265,7 @@ function refreshStravaCookies() {
 }
 
 export function setStravaHeatmapURLs() {
-    refreshStravaCookies().then(() => {
+    /*refreshStravaCookies().then(() => {
         overlays.stravaHeatmapRun.tiles = [];
         overlays.stravaHeatmapTrailRun.tiles = [];
         overlays.stravaHeatmapHike.tiles = [];
@@ -281,5 +281,5 @@ export function setStravaHeatmapURLs() {
                 overlays[activity].tiles.push(`${server}/${stravaHeatmapActivityIds[activity]}/${get(settings.stravaHeatmapColor)}/{z}/{x}/{y}@2x.png`); //?Signature=${stravaCookies['CloudFront-Signature']}&Key-Pair-Id=${stravaCookies['CloudFront-Key-Pair-Id']}&Policy=${stravaCookies['CloudFront-Policy']}`);
             }
         }
-    });
+    });*/
 }
\ No newline at end of file