diff --git a/src/server/armoury_entity.qc b/src/server/armoury_entity.qc
index bf39393..82ea760 100644
--- a/src/server/armoury_entity.qc
+++ b/src/server/armoury_entity.qc
@@ -136,7 +136,7 @@ armoury_entity::touch(void)
 void
 armoury_entity::Respawn(void)
 {
-	SetModel(m_oldModel);
+	SetModel(GetSpawnModel());
 	setsize(this, [-16,-16,0], [16,16,16]);
 	solid = SOLID_TRIGGER;
 	m_iLeft = m_iCount;
diff --git a/src/server/item_suit.qc b/src/server/item_suit.qc
index add8a51..08be8b7 100644
--- a/src/server/item_suit.qc
+++ b/src/server/item_suit.qc
@@ -55,8 +55,8 @@ item_suit::Respawn(void)
 	SetSolid(SOLID_TRIGGER);
 	SetMovetype(MOVETYPE_TOSS);
 	SetSize(VEC_HULL_MIN, VEC_HULL_MAX);
-	SetOrigin(m_oldOrigin);
-	SetModel(m_oldModel);
+	SetOrigin(GetSpawnOrigin());
+	SetModel(GetSpawnModel());
 
 	think = __NULL__;
 	nextthink = -1;