diff --git a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs index 3822f1d39a..d24586a3d0 100644 --- a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs @@ -462,8 +462,8 @@ namespace Content.Server.GameObjects var playerEntity = session.AttachedEntity; var used = GetActiveHand?.Owner; - if (playerEntity == Owner && used != null) - { + if (playerEntity == Owner && used != null && slot.ContainedEntity != null) + { var interactionSystem = _entitySystemManager.GetEntitySystem(); interactionSystem.Interaction(Owner, used, slot.ContainedEntity, GridCoordinates.Nullspace);