diff --git a/personal_spawn_pad_custom/lua/entities/personal-spawn-pad/init.lua b/personal_spawn_pad_custom/lua/entities/personal-spawn-pad/init.lua
index e6c8bca..8631e07 100644
--- a/personal_spawn_pad_custom/lua/entities/personal-spawn-pad/init.lua
+++ b/personal_spawn_pad_custom/lua/entities/personal-spawn-pad/init.lua
@@ -38,7 +38,7 @@ function ENT:Initialize()
 	self.Entity:DrawShadow(false)
 	self.Entity:SetMaxHealth(5)
 	self.Entity:SetHealth(5)
-	self.Entity:SetOwner(game.GetWorld())
+	self.Entity:SetOwner(self.SpawnPadOwner)
 	self.HealthAmnt = GetConVar( "personal_spawn_pad_hp" ):GetInt()
 	
 	local phys = self.Entity:GetPhysicsObject()