diff --git a/maps/src/maps.rs b/maps/src/maps.rs
index 4ca76d9..2ed7961 100644
--- a/maps/src/maps.rs
+++ b/maps/src/maps.rs
@@ -376,3 +376,12 @@ pub fn generate_free_roam_maps(room_mode: RoomMode, event: Holiday) -> Maps {
         map_variants,
     }
 }
+
+
+pub fn null_free_roam_maps(_room_mode: RoomMode, _event: Holiday) -> Maps {
+    Maps {
+        enemy_data: Default::default(),
+        object_data: Default::default(),
+        map_variants: Default::default(),
+    }
+}
diff --git a/src/bin/main.rs b/src/bin/main.rs
index 126cbb1..afeb79f 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -8,6 +8,7 @@ use elseware::patch::{PatchServerState, generate_patch_tree, load_config, load_m
 use elseware::ship::ship::ShipServerStateBuilder;
 
 use maps::Holiday;
+use maps::maps::generate_free_roam_maps;
 use entity::gateway::{EntityGateway, InMemoryGateway};
 use entity::account::{NewUserAccountEntity, NewUserSettingsEntity};
 use entity::character::NewCharacterEntity;
@@ -369,6 +370,7 @@ fn main() {
             .standard_quest_builder(Box::new(quests::load_standard_quests))
             .government_quest_builder(Box::new(quests::load_government_quests))
             .drop_table_builder(Box::new(StandardDropTable::new))
+            .map_builder(Box::new(generate_free_roam_maps))
             .gateway(entity_gateway.clone())
             .build();
         let sub_ship_state = ship_state.clone();
@@ -388,6 +390,7 @@ fn main() {
             .standard_quest_builder(Box::new(quests::load_standard_quests))
             .government_quest_builder(Box::new(quests::load_government_quests))
             .drop_table_builder(Box::new(StandardDropTable::new))
+            .map_builder(Box::new(generate_free_roam_maps))
             .gateway(entity_gateway.clone())
             .build();
         let sub_ship_state = ship_state.clone();
@@ -406,6 +409,7 @@ fn main() {
             .standard_quest_builder(Box::new(quests::load_standard_quests))
             .government_quest_builder(Box::new(quests::load_government_quests))
             .drop_table_builder(Box::new(StandardDropTable::new))
+            .map_builder(Box::new(generate_free_roam_maps))
             .gateway(entity_gateway.clone())
             .build();
         let sub_ship_state = ship_state.clone();
diff --git a/src/bin/ship.rs b/src/bin/ship.rs
index 7204925..b39f504 100644
--- a/src/bin/ship.rs
+++ b/src/bin/ship.rs
@@ -3,6 +3,7 @@ use entity::gateway::postgres::PostgresGateway;
 use elseware::ship::ship::ShipServerStateBuilder;
 use networking::interserver::AuthToken;
 use drops::StandardDropTable;
+use maps::maps::generate_free_roam_maps;
 
 fn main() {
     let colors = fern::colors::ColoredLevelConfig::new()
@@ -47,6 +48,7 @@ fn main() {
         .standard_quest_builder(Box::new(quests::load_standard_quests))
         .government_quest_builder(Box::new(quests::load_government_quests))
         .drop_table_builder(Box::new(StandardDropTable::new))
+        .map_builder(Box::new(generate_free_roam_maps))
         .build();
 
     let shipgate_ip = std::env::var("SHIPGATE_IP").unwrap().parse().unwrap();
diff --git a/src/ship/ship.rs b/src/ship/ship.rs
index 5d8beea..b584ad5 100644
--- a/src/ship/ship.rs
+++ b/src/ship/ship.rs
@@ -30,7 +30,7 @@ use maps::room::{RoomMode, Episode, Difficulty};
 use quests::{QuestList, QuestLoadError};
 use maps::Holiday;
 use maps::area::MapAreaError;
-use maps::maps::{Maps, MapsError, generate_free_roam_maps};
+use maps::maps::{Maps, MapsError, null_free_roam_maps};
 use crate::ship::packet::handler;
 use shops::{WeaponShop, ToolShop, ArmorShop};
 use trade::TradeState;
@@ -434,7 +434,7 @@ impl<EG: EntityGateway + Clone + 'static> ShipServerStateBuilder<EG> {
             shops: ItemShops::default(),
             blocks: Blocks(blocks),
             event: self.event.unwrap_or(Holiday::None),
-            map_builder: Arc::new(self.map_builder.unwrap_or(Box::new(generate_free_roam_maps))),
+            map_builder: Arc::new(self.map_builder.unwrap_or(Box::new(null_free_roam_maps))),
             drop_table_builder: Arc::new(self.drop_table_builder.unwrap_or(Box::new(null_drop_table))),
             standard_quest_builder: Arc::new(self.standard_quest_builder.unwrap_or(Box::new(|_| Ok(QuestList::new())))),
             government_quest_builder: Arc::new(self.government_quest_builder.unwrap_or(Box::new(|_| Ok(QuestList::new())))),