diff --git a/assets/themes/surveillance/surveillance.json b/assets/themes/surveillance/surveillance.json
index ae85e6560..156370848 100644
--- a/assets/themes/surveillance/surveillance.json
+++ b/assets/themes/surveillance/surveillance.json
@@ -58,7 +58,6 @@
     "ko": "감시 카메라 및 기타 감시 수단"
   },
   "icon": "./assets/themes/surveillance/logo.svg",
-  "defaultBackgroundId": "maptiler.carto",
   "layers": [
     "surveillance_camera",
     {
diff --git a/src/Models/ThemeConfig/Conversion/ValidateTheme.ts b/src/Models/ThemeConfig/Conversion/ValidateTheme.ts
index dc89de029..db39dc18c 100644
--- a/src/Models/ThemeConfig/Conversion/ValidateTheme.ts
+++ b/src/Models/ThemeConfig/Conversion/ValidateTheme.ts
@@ -149,16 +149,14 @@ export class ValidateTheme extends DesugaringStep<ThemeConfigJson> {
         }
 
         if (json.defaultBackgroundId) {
-            /*
-            TODO re-enable this check
             const backgroundId = json.defaultBackgroundId
-
             const isCategory =
                 backgroundId === "photo" || backgroundId === "map" || backgroundId === "osmbasedmap"
 
-            if (!isCategory && !ValidateTheme._availableLayers.has(backgroundId)) {
-                const options = Array.from(ValidateTheme._availableLayers)
-                const nearby = Utils.sortedByLevenshteinDistance(backgroundId, options, (t) => t)
+            const knownIds = Array.from(AvailableRasterLayers.allAvailableGlobalLayers).map(l => l.properties.id)
+            const available = new Set(knownIds)
+            if (!isCategory && !available.has(backgroundId)) {
+                const nearby = Utils.sortedByLevenshteinDistance(backgroundId, knownIds, (t) => t)
                 context
                     .enter("defaultBackgroundId")
                     .err(
@@ -166,7 +164,7 @@ export class ValidateTheme extends DesugaringStep<ThemeConfigJson> {
                             .slice(0, 5)
                             .join(", ")}`,
                     )
-            }*/
+            }
         }
 
         for (let i = 0; i < theme.layers.length; i++) {