diff --git a/Content.Client/Animations/ReusableAnimations.cs b/Content.Client/Animations/ReusableAnimations.cs
index 59b333e20f..7ce8cb358f 100644
--- a/Content.Client/Animations/ReusableAnimations.cs
+++ b/Content.Client/Animations/ReusableAnimations.cs
@@ -15,6 +15,10 @@ namespace Content.Client.Animations
         public static void AnimateEntityPickup(EntityUid entity, EntityCoordinates initialPosition, Vector2 finalPosition, IEntityManager? entMan = null)
         {
             IoCManager.Resolve(ref entMan);
+
+            if (entMan.Deleted(entity) || !initialPosition.IsValid(entMan))
+                return;
+
             var animatableClone = entMan.SpawnEntity("clientsideclone", initialPosition);
             string val = entMan.GetComponent<MetaDataComponent>(entity).EntityName;
             entMan.GetComponent<MetaDataComponent>(animatableClone).EntityName = val;
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index c3abe34cb4..79456eea9a 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -56,7 +56,7 @@ namespace Content.Client.Hands
 
         private void HandlePickupAnimation(PickupAnimationMessage msg)
         {
-            if (!msg.EntityUid.IsValid())
+            if (!EntityManager.EntityExists(msg.EntityUid))
                 return;
 
             if (!_gameTiming.IsFirstTimePredicted)