diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index eec78456..2f4394e8 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -854,10 +854,11 @@ namespace TShockAPI
 
 			if (Config.RememberLeavePos)
 			{
+			if (RememberedPos.GetLeavePos(player.Name, player.IP) != Vector2.Zero){
 				var pos = RememberedPos.GetLeavePos(player.Name, player.IP);
 				player.LastNetPosition = pos;
 				player.Teleport((int) pos.X, (int) pos.Y + 3);
-			}
+			}}
 
 			e.Handled = true;
 		}