diff --git a/enacts/flex_fcst/layout.py b/enacts/flex_fcst/layout.py
index 4dd229282..bc1a62867 100644
--- a/enacts/flex_fcst/layout.py
+++ b/enacts/flex_fcst/layout.py
@@ -359,10 +359,7 @@ def map_layout():
             dlf.Map(
                 [
                     dlf.LayersControl(id="layers_control", position="topleft"),
-                    dlf.LayerGroup(
-                        [dlf.Marker(id="loc_marker", position=(0, 0))],
-                        id="layers_group"
-                    ),
+                    dlf.Marker(id="loc_marker", position=(0, 0)),
                     dlf.ScaleControl(imperial=False, position="bottomleft"),
                     dlf.Colorbar(
                         id="fcst_colorbar",
diff --git a/enacts/flex_fcst/maproom.py b/enacts/flex_fcst/maproom.py
index 910178486..a192ea14b 100644
--- a/enacts/flex_fcst/maproom.py
+++ b/enacts/flex_fcst/maproom.py
@@ -161,6 +161,7 @@ def read_cptdataset(lead_time, start_date, y_transform=config["y_transform"]):
             Output("lng_input", "max"),
             Output("lng_input_tooltip", "children"),
             Output("map", "center"),
+            Output("layers_control", "children"),
             State("lead_time_label", "style"),
             State("lead_time_control", "style"),
             Input("location", "pathname"),
@@ -218,13 +219,49 @@ def initialize(lead_time_label_style, lead_time_control_style, path):
         lead_time_label_style = dict(lead_time_label_style, display=target_display)
         lead_time_control_style = dict(lead_time_control_style, display=target_display)
 
+        layers = [
+            dlf.BaseLayer(
+                dlf.TileLayer(
+                    url="https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png",
+                ),
+                name="Street",
+                checked=False,
+            ),
+            dlf.BaseLayer(
+                dlf.TileLayer(
+                    url="https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png"
+                ),
+                name="Topo",
+                checked=True,
+            ),
+        ] + [
+            make_adm_overlay(
+                adm["name"],
+                adm["sql"],
+                adm["color"],
+                i+1,
+                len(GLOBAL_CONFIG["datasets"]["shapes_adm"])-i,
+                is_checked=adm["is_checked"]
+            )
+            for i, adm in enumerate(GLOBAL_CONFIG["datasets"]["shapes_adm"])
+        ] + [
+            dlf.Overlay(
+                dlf.TileLayer(
+                    opacity=1,
+                    id="tile_layer",
+                ),
+                name="Forecast",
+                checked=True,
+            ),
+        ]
         return (
             phys_units,
             start_dates, start_dates[-1],
             lead_time_label_style, lead_time_control_style,
             lat_min, lat_max, lat_label,
             lon_min, lon_max, lon_label,
-            center_of_the_map
+            center_of_the_map,
+            layers,
         )
 
     @APP.callback(
@@ -661,7 +698,7 @@ def draw_colorbar(proba, variable, percentile):
 
 
     @APP.callback(
-        Output("layers_control", "children"),
+        Output("tile_layer", "url"),
         Output("forecast_warning", "is_open"),
         Input("proba", "value"),
         Input("variable", "value"),
@@ -670,7 +707,7 @@ def draw_colorbar(proba, variable, percentile):
         Input("start_date","value"),
         Input("lead_time","value")
     )
-    def make_map(proba, variable, percentile, threshold, start_date, lead_time):
+    def set_tile_url(proba, variable, percentile, threshold, start_date, lead_time):
 
         try:
             if variable != "Percentile":
@@ -686,41 +723,7 @@ def make_map(proba, variable, percentile, threshold, start_date, lead_time):
         except:
             url_str= ""
             send_alarm = True
-        return [
-            dlf.BaseLayer(
-                dlf.TileLayer(
-                    url="https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png",
-                ),
-                name="Street",
-                checked=False,
-            ),
-            dlf.BaseLayer(
-                dlf.TileLayer(
-                    url="https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png"
-                ),
-                name="Topo",
-                checked=True,
-            ),
-        ] + [
-            make_adm_overlay(
-                adm["name"],
-                adm["sql"],
-                adm["color"],
-                i+1,
-                len(GLOBAL_CONFIG["datasets"]["shapes_adm"])-i,
-                is_checked=adm["is_checked"]
-            )
-            for i, adm in enumerate(GLOBAL_CONFIG["datasets"]["shapes_adm"])
-        ] + [
-            dlf.Overlay(
-                dlf.TileLayer(
-                    url=url_str,
-                    opacity=1,
-                ),
-                name="Forecast",
-                checked=True,
-            ),
-        ], send_alarm
+        return url_str, send_alarm
 
 
     # Endpoints