diff --git a/frontend/src/pages/LocationMapManager.jsx b/frontend/src/pages/LocationMapManager.jsx
index 6fed4cd..ccf6137 100644
--- a/frontend/src/pages/LocationMapManager.jsx
+++ b/frontend/src/pages/LocationMapManager.jsx
@@ -434,19 +434,21 @@ export default function LocationMapManager() {
       <LocationMapTopbar location={location} status={status} onBack={handleBack} />
 
       <main className="location-map-workspace">
-        <LocationMapToolbar
-          mode={mode}
-          editorTool={editorTool}
-          hasAnyMap={hasAnyMap}
-          canManage={canManage}
-          zoom={zoom}
-          setZoom={setZoom}
-          onFit={handleFitMap}
-          onView={handleViewMode}
-          onEdit={handleEditMode}
-          onPanMode={() => setEditorTool("pan")}
-          onEditObjects={() => setEditorTool("edit")}
-        />
+        {hasAnyMap && mode !== "setup" ? (
+          <LocationMapToolbar
+            mode={mode}
+            editorTool={editorTool}
+            hasAnyMap={hasAnyMap}
+            canManage={canManage}
+            zoom={zoom}
+            setZoom={setZoom}
+            onFit={handleFitMap}
+            onView={handleViewMode}
+            onEdit={handleEditMode}
+            onPanMode={() => setEditorTool("pan")}
+            onEditObjects={() => setEditorTool("edit")}
+          />
+        ) : null}
 
         {!hasAnyMap || (mode === "setup" && mapState?.draft_map && !mapState?.published_map) ? (
           <LocationMapSetupPanel
diff --git a/frontend/tests/location-map-manager.spec.ts b/frontend/tests/location-map-manager.spec.ts
index 8180c70..21711b5 100644
--- a/frontend/tests/location-map-manager.spec.ts
+++ b/frontend/tests/location-map-manager.spec.ts
@@ -263,6 +263,7 @@ test("admin creates a map from zones, saves a draft, and publishes it", async ({
   await expect(page.getByText("Eastvale")).toBeVisible();
   await expect(page.getByRole("heading", { name: "No Map" })).toBeVisible();
   await expect(page.getByRole("button", { name: "Create Map From Existing Zones" })).toBeVisible();
+  await expect(page.getByLabel("Map controls")).toHaveCount(0);
 
   await page.getByRole("button", { name: "Create Map From Existing Zones" }).click();
   await expect(page.getByText("Bakery")).toBeVisible();