diff --git a/src/features/home/VenueMap.module.css b/src/features/home/VenueMap.module.css
index 35a35f5..34d755d 100644
--- a/src/features/home/VenueMap.module.css
+++ b/src/features/home/VenueMap.module.css
@@ -13,3 +13,24 @@
 :global(.leaflet-container) {
   font-family: var(--font-body);
 }
+
+:global(:root[data-theme='dark']) .map :global(.leaflet-bar a),
+:global(:root[data-theme='dark']) .map :global(.leaflet-popup-content-wrapper),
+:global(:root[data-theme='dark']) .map :global(.leaflet-popup-tip),
+:global(:root[data-theme='dark']) .map :global(.leaflet-control-attribution) {
+  color: var(--ink);
+  background: var(--control-bg);
+}
+
+:global(:root[data-theme='dark']) .map :global(.leaflet-bar a) {
+  border-bottom-color: var(--rule);
+}
+
+:global(:root[data-theme='dark']) .map :global(.leaflet-bar a:hover) {
+  color: var(--ink);
+  background: var(--surface-hover);
+}
+
+:global(:root[data-theme='dark']) .map :global(.leaflet-control-attribution a) {
+  color: var(--blue-deep);
+}
diff --git a/src/features/home/VenueMap.tsx b/src/features/home/VenueMap.tsx
index a6b3461..335b9c9 100644
--- a/src/features/home/VenueMap.tsx
+++ b/src/features/home/VenueMap.tsx
@@ -21,6 +21,17 @@ const venueIcon = L.icon({
 const ATTRIBUTION =
   '&copy; <a href="https://carto.com/">CARTO</a> &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
 
+const TILE_URLS = {
+  light: 'https://basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png',
+  dark: 'https://basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png',
+} as const
+
+function getTileUrl() {
+  return document.documentElement.dataset.theme === 'dark'
+    ? TILE_URLS.dark
+    : TILE_URLS.light
+}
+
 export function VenueMap() {
   const containerRef = useRef<HTMLDivElement>(null)
 
@@ -34,10 +45,24 @@ export function VenueMap() {
       scrollWheelZoom: false,
     }).setView([lat, lng], 14)
 
-    L.tileLayer('https://basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
+    let currentTileUrl = getTileUrl()
+    const tileLayer = L.tileLayer(currentTileUrl, {
       attribution: '',
     }).addTo(map)
 
+    const themeObserver = new MutationObserver(() => {
+      const nextTileUrl = getTileUrl()
+      if (nextTileUrl === currentTileUrl) return
+
+      currentTileUrl = nextTileUrl
+      tileLayer.setUrl(currentTileUrl)
+    })
+
+    themeObserver.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['data-theme'],
+    })
+
     L.control
       .attribution({ position: 'bottomright', prefix: false })
       .addAttribution(ATTRIBUTION)
@@ -49,6 +74,7 @@ export function VenueMap() {
       .openPopup()
 
     return () => {
+      themeObserver.disconnect()
       map.remove()
     }
   }, [])