diff --git a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs
index 69ceade1f0..0009680a3a 100644
--- a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs
@@ -443,6 +443,13 @@ namespace Content.Client.GameObjects.EntitySystems
                 if (args.Function == EngineKeyFunctions.Use ||
                     args.Function == ContentKeyFunctions.Point)
                 {
+                    // TODO: Remove an entity from the menu when it is deleted
+                    if (_entity.Deleted)
+                    {
+                        _master.CloseAllMenus();
+                        return;
+                    }
+
                     var inputSys = _master.EntitySystemManager.GetEntitySystem<InputSystem>();
 
                     var func = args.Function;