diff --git a/src/server/info_tfgoal.qc b/src/server/info_tfgoal.qc
index 0313189..11d62f8 100644
--- a/src/server/info_tfgoal.qc
+++ b/src/server/info_tfgoal.qc
@@ -266,9 +266,9 @@ info_tfgoal::Respawn(void)
 {
 	solid = SOLID_TRIGGER;
 	movetype = MOVETYPE_NONE;
-	SetModel(m_oldModel);
+	SetModel(GetSpawnModel());
 	setsize(this, VEC_HULL_MIN, VEC_HULL_MAX);
-	SetOrigin(m_oldOrigin);
+	SetOrigin(GetSpawnOrigin());
 }
 
 void
@@ -420,8 +420,8 @@ i_t_g::Respawn(void)
 {
 	solid = SOLID_BSPTRIGGER;
 	movetype = MOVETYPE_NONE;
-	SetModel(m_oldModel);
-	SetOrigin(m_oldOrigin);
+	SetModel(GetSpawnModel());
+	SetOrigin(GetSpawnOrigin());
 }
 
 void
diff --git a/src/server/item_tfgoal.qc b/src/server/item_tfgoal.qc
index 4ac844b..47fa560 100644
--- a/src/server/item_tfgoal.qc
+++ b/src/server/item_tfgoal.qc
@@ -115,9 +115,9 @@ item_tfgoal::Respawn(void)
 {
 	solid = SOLID_TRIGGER;
 	movetype = MOVETYPE_NONE;
-	SetModel(m_oldModel);
+	SetModel(GetSpawnModel());
 	setsize(this, VEC_HULL_MIN, VEC_HULL_MAX);
-	SetOrigin(m_oldOrigin);
+	SetOrigin(GetSpawnOrigin());
 	m_eActivator = __NULL__;
 }