diff --git a/src/cmd.rs b/src/cmd.rs
index fc7cb79..aeeb860 100644
--- a/src/cmd.rs
+++ b/src/cmd.rs
@@ -1602,7 +1602,7 @@ fn spawn_entities(
             load_asset(ar_asset_name.as_str(), &mut entitycmd, &*asset_server);
         }
 
-        if state.is_point_of_interest || state.is_moon || state.is_planet {
+        if state.is_point_of_interest || state.is_player || state.is_moon || state.is_planet {
             let mut entitycmd = commands.spawn((
                 hud::PointOfInterestMarker(actor_entity),
                 world::DespawnOnPlayerDeath,
@@ -1614,12 +1614,17 @@ fn spawn_entities(
                 NotShadowCaster,
                 NotShadowReceiver,
             ));
-            let model = if state.is_point_of_interest {
+            let model = if state.is_player {
+                "marker_race"
+            } else if state.is_point_of_interest {
                 "point_of_interest"
             } else if state.is_planet {
                 "marker_planets"
-            } else {
+            } else if state.is_moon {
                 "marker_satellites"
+            } else {
+                error!("Can't determine 3d model for point-of-interest marker!");
+                "error"
             };
             load_asset(model, &mut entitycmd, &*asset_server);
         }