diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
index 4a094fae79..759ff0585b 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
@@ -302,9 +302,9 @@ namespace Content.Server.GameObjects
         }
 
         /// <inheritdoc />
-        void IActivate.Activate(IEntity user)
+        void IActivate.Activate(ActivateEventArgs eventArgs)
         {
-            ((IUse) this).UseEntity(new UseEntityEventArgs { User = user });
+            ((IUse) this).UseEntity(new UseEntityEventArgs { User = eventArgs.User });
         }
 
         private void _ensureInitialCalculated()
diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
index dc091410a0..982a56df0b 100644
--- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
@@ -125,7 +125,12 @@ namespace Content.Server.GameObjects.EntitySystems
         ///     Called when this component is activated by another entity.
         /// </summary>
         /// <param name="user">Entity that activated this component.</param>
-        void Activate(IEntity user);
+        void Activate(ActivateEventArgs eventArgs);
+    }
+
+    public class ActivateEventArgs : EventArgs
+    {
+        public IEntity User { get; set; }
     }
 
     /// <summary>
@@ -159,7 +164,7 @@ namespace Content.Server.GameObjects.EntitySystems
             if (!playerEnt.Transform.GridPosition.InRange(used.Transform.GridPosition, INTERACTION_RANGE))
                 return;
 
-            activateComp.Activate(playerEnt);
+            activateComp.Activate(new ActivateEventArgs { User = playerEnt });
         }
 
         private void HandleUseItemInHand(ICommonSession session, GridCoordinates coords, EntityUid uid)