diff --git a/Source/Client/Patches/TimestampFixer.cs b/Source/Client/Patches/TimestampFixer.cs
index dedc99b0..5526021d 100644
--- a/Source/Client/Patches/TimestampFixer.cs
+++ b/Source/Client/Patches/TimestampFixer.cs
@@ -96,8 +96,12 @@ static void Postfix(Pawn __instance)
         if (Multiplayer.Client == null) return;
         if (__instance.Map == null) return;
 
-        if (__instance.GetComp<MultiplayerPawnComp>().worldPawnRemoveTick == Multiplayer.AsyncWorldTime.worldTicks)
+        var comp = __instance.GetComp<MultiplayerPawnComp>();
+        if (comp.worldPawnRemoveTick != -1)
+        {
             TimestampFixer.FixPawn(__instance, null, __instance.Map);
+            comp.worldPawnRemoveTick = -1;
+        }
     }
 }
 
@@ -110,6 +114,9 @@ static void Prefix(Pawn p)
 
         var lastMap = p.GetComp<MultiplayerPawnComp>().lastMap;
         if (lastMap != -1)
+        {
             TimestampFixer.FixPawn(p, Find.Maps.FirstOrDefault(m => m.uniqueID == lastMap), null);
+            p.GetComp<MultiplayerPawnComp>().lastMap = -1;
+        }
     }
 }