diff --git a/Content.Server/GameObjects/Components/GUI/StrippableComponent.cs b/Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
index 38270dcf46..484a60dd53 100644
--- a/Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
+++ b/Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
@@ -43,14 +43,16 @@ namespace Content.Server.GameObjects.Components.GUI
                 UserInterface.OnReceiveMessage += HandleUserInterfaceMessage;
             }
 
-            Owner.EnsureComponent<InventoryComponent>();
-            Owner.EnsureComponent<HandsComponent>();
-
             if (Owner.TryGetComponent(out InventoryComponent? inventory))
             {
                 inventory.OnItemChanged += UpdateSubscribed;
             }
 
+            if (Owner.TryGetComponent(out HandsComponent? hands))
+            {
+                hands.OnItemChanged += UpdateSubscribed;
+            }
+
             // Initial update.
             UpdateSubscribed();
         }