diff --git a/src/main/java/org/ultramine/server/Teleporter.java b/src/main/java/org/ultramine/server/Teleporter.java
index 869f592..d2a7dff 100644
--- a/src/main/java/org/ultramine/server/Teleporter.java
+++ b/src/main/java/org/ultramine/server/Teleporter.java
@@ -122,6 +122,11 @@
 	
 	private boolean update()
 	{
+		if(target.isDead)
+		{
+			target.getData().core().setTeleporter(null);
+			return true;
+		}
 		if(timeEnd - System.currentTimeMillis() <= 0)
 		{
 			doTeleportation(target, dst);