diff --git a/SubstrateCS/Source/Player.cs b/SubstrateCS/Source/Player.cs
index 13a266f..0a51566 100644
--- a/SubstrateCS/Source/Player.cs
+++ b/SubstrateCS/Source/Player.cs
@@ -500,6 +500,11 @@ namespace Substrate
                 tree["SpawnY"] = new TagNodeInt(_spawnY ?? 0);
                 tree["SpawnZ"] = new TagNodeInt(_spawnZ ?? 0);
             }
+            else {
+                tree.Remove("SpawnX");
+                tree.Remove("SpawnY");
+                tree.Remove("SpawnZ");
+            }
 
             if (_world != null) {
                 tree["World"] = new TagNodeString(_world);