diff --git a/components/cal/legend.vue b/components/cal/legend.vue
index 7d52e6d..f55a5e9 100644
--- a/components/cal/legend.vue
+++ b/components/cal/legend.vue
@@ -36,6 +36,14 @@
           </div>
         </div>
 
+        <!-- Administrative Boundaries -->
+        <div v-if="props.showAdminBoundaries && !props.hasData" class="cal-map-legend-section">
+          <div>
+            <div class="legend-item legend-marker-square" style="border:solid red 2px; background: transparent;" />
+            <div>Administrative Boundaries</div>
+          </div>
+        </div>
+
         <!-- Geometry Style -->
         <div v-if="props.hasData && (['Route', 'Stop'].includes(props.dataDisplayMode))" class="cal-map-legend-section">
           <div>
@@ -79,7 +87,7 @@
           </div>
         </div>
 
-        <div v-if="!props.hasData && !props.displayEditBboxMode">
+        <div v-if="!props.hasData && !props.displayEditBboxMode && props.hasScenarioData">
           <p class="legend-loading">
             <o-loading
               :active="true"
@@ -100,6 +108,8 @@ const props = defineProps<{
   hasData: boolean
   displayEditBboxMode?: boolean
   hideUnmarked?: boolean
+  hasScenarioData: boolean
+  showAdminBoundaries?: boolean
 }>()
 </script>
 
diff --git a/components/cal/map.vue b/components/cal/map.vue
index e373c21..1466445 100644
--- a/components/cal/map.vue
+++ b/components/cal/map.vue
@@ -20,6 +20,8 @@
       :has-data="hasData"
       :display-edit-bbox-mode="displayEditBboxMode"
       :hide-unmarked="hideUnmarked"
+      :has-scenario-data="hasScenarioData"
+      :show-admin-boundaries="showAdminBoundaries"
     />
 
     <cal-map-viewer-ts
@@ -542,6 +544,16 @@ const hasData = computed((): boolean => {
   return !!(props.scenarioFilterResult?.stops.length || props.scenarioFilterResult?.routes.length)
 })
 
+// Is there scenario data loaded (regardless of whether it has stops/routes)?
+const hasScenarioData = computed((): boolean => {
+  return !!props.scenarioFilterResult
+})
+
+// Are administrative boundaries selected?
+const showAdminBoundaries = computed((): boolean => {
+  return props.censusGeographiesSelected && props.censusGeographiesSelected.length > 0
+})
+
 /////////////////
 // Map events