diff --git a/src/app/student/map/_components/MapComponent.tsx b/src/app/student/map/_components/MapComponent.tsx
index 056199b..669e968 100644
--- a/src/app/student/map/_components/MapComponent.tsx
+++ b/src/app/student/map/_components/MapComponent.tsx
@@ -21,7 +21,7 @@ import {
   Source
 } from "react-map-gl/maplibre"
 import { BoothMap, GeoJsonBooth } from "../lib/booths"
-import { BoothMarkers } from "./BoothMarkers"
+import { BoothMarker } from "./BoothMarker"
 
 const boothLayerStyle: FillLayer = {
   source: "booths",
@@ -136,7 +136,10 @@ export function MapComponent({
 
   // Don't want to rerender markers on every map render
   const markers = useMemo(
-    () => BoothMarkers({ boothMap: boothsById, scale: markerScale }),
+    () =>
+      Array.from(boothsById.values()).map(booth => (
+        <BoothMarker key={booth.id} booth={booth} scale={markerScale} />
+      )),
     [boothsById, markerScale]
   )
 
diff --git a/src/app/student/map/_components/MapListFilteringHeader.tsx b/src/app/student/map/_components/MapListFilteringHeader.tsx
index 3c87323..ddff3ee 100644
--- a/src/app/student/map/_components/MapListFilteringHeader.tsx
+++ b/src/app/student/map/_components/MapListFilteringHeader.tsx
@@ -1,4 +1,4 @@
-import MultiSelect from "@/app/student/exhibitors/_components/MultiSelect"
+import MultiSelect from "@/app/student/_components/MultiSelect"
 import { Booth } from "@/app/student/map/lib/booths"
 import { Exhibitor } from "@/components/shared/hooks/api/useExhibitors"
 import { Input } from "@/components/ui/input"
diff --git a/src/app/student/map/page.tsx b/src/app/student/map/page.tsx
index 93a29d1..430c460 100644
--- a/src/app/student/map/page.tsx
+++ b/src/app/student/map/page.tsx
@@ -8,6 +8,7 @@ import { LocationId, locations } from "@/app/student/map/lib/locations"
 import { feature } from "@/components/shared/feature"
 import { fetchExhibitors } from "@/components/shared/hooks/api/useExhibitors"
 import { notFound } from "next/navigation"
+import { Suspense } from "react"
 
 export default async function Page() {
   if (!feature("MAP_PAGE")) {
@@ -35,16 +36,16 @@ export default async function Page() {
     boothsByLocation.get(booth.location)!.set(id, booth)
   })
 
-  const editorMode = true
-
   return (
     // TODO: pt-16 is to account for the navbar, will break if navbar size changes
-    <div className="flex h-screen pt-16">
-      <MainView
-        exhibitorsById={exhibitorsByID}
-        boothsByLocation={boothsByLocation}
-        boothsById={boothsById}
-      />
-    </div>
+    <Suspense>
+      <div className="flex h-screen pt-16">
+        <MainView
+          exhibitorsById={exhibitorsByID}
+          boothsByLocation={boothsByLocation}
+          boothsById={boothsById}
+        />
+      </div>
+    </Suspense>
   )
 }
diff --git a/src/feature_flags.ts b/src/feature_flags.ts
index 45bde5d..e28a46f 100644
--- a/src/feature_flags.ts
+++ b/src/feature_flags.ts
@@ -21,8 +21,8 @@ export const FEATURE_FLAGS: Record<
   keyof typeof FEATURE_FLAG_DEFINITIONS,
   boolean
 > = {
-  EVENT_PAGE: false,
-  MAP_PAGE: true
+  EVENT_PAGE: true,
+  MAP_PAGE: false
 }
 
 export default FEATURE_FLAGS