diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs
index f190103ed..f3a6a158b 100644
--- a/Source/Game/Spells/SpellEffects.cs
+++ b/Source/Game/Spells/SpellEffects.cs
@@ -5756,6 +5756,15 @@ namespace Game.Spells
 
             target.UpdateTraitConfig(m_customArg as TraitConfigPacket, damage, false);
         }
+
+        [SpellEffectHandler(SpellEffectName.TeleportGraveyard)]
+        void EffectTeleportGraveyard()
+        {
+            if (effectHandleMode != SpellEffectHandleMode.HitTarget)
+                return;
+
+            unitTarget.ToPlayer()?.RepopAtGraveyard();
+        }
     }
 
     public class DispelableAura