diff --git a/src/server/spawn.qc b/src/server/spawn.qc
index b60cc9e..dbcfbbf 100644
--- a/src/server/spawn.qc
+++ b/src/server/spawn.qc
@@ -17,25 +17,31 @@
 void info_player_start(void)
 {
 	self.solid = SOLID_TRIGGER;
-	setsize(self, VEC_HULL_MIN, VEC_HULL_MAX);
 	self.botinfo = BOTINFO_SPAWNPOINT;
+	setsize(self, VEC_HULL_MIN, VEC_HULL_MAX);
+	setorigin_safe(self, self.origin);
 }
 
 void info_player_deathmatch(void)
 {
 	self.solid = SOLID_TRIGGER;
-	setsize(self, VEC_HULL_MIN, VEC_HULL_MAX);
 	self.botinfo = BOTINFO_SPAWNPOINT;
+	setsize(self, VEC_HULL_MIN, VEC_HULL_MAX);
+	setorigin_safe(self, self.origin);
 }
 
 void info_player_team1(void)
 {
 	self.classname = "info_player_deathmatch";
 	self.botinfo = BOTINFO_SPAWNPOINT;
+	setsize(self, VEC_HULL_MIN, VEC_HULL_MAX);
+	setorigin_safe(self, self.origin);
 }
 
 void info_player_team2(void)
 {
 	self.classname = "info_player_deathmatch";
 	self.botinfo = BOTINFO_SPAWNPOINT;
+	setsize(self, VEC_HULL_MIN, VEC_HULL_MAX);
+	setorigin_safe(self, self.origin);
 }