diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index 92efc769ea..ca69a78efb 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -374,7 +374,12 @@ fn handle_home(
         .is_some()
     {
         let home_pos = server.state.ecs().read_resource::<SpawnPoint>().0;
+        let time = *server.state.ecs().read_resource::<common::state::Time>();
+
         server.state.write_component(target, comp::Pos(home_pos));
+        server
+            .state
+            .write_component(target, comp::Waypoint::new(home_pos, time));
         server.state.write_component(target, comp::ForceUpdate);
     } else {
         server.notify_client(