diff --git a/Content.Server/Dice/DiceSystem.cs b/Content.Server/Dice/DiceSystem.cs
index e373c4f6fc..cd8753210b 100644
--- a/Content.Server/Dice/DiceSystem.cs
+++ b/Content.Server/Dice/DiceSystem.cs
@@ -25,7 +25,7 @@ namespace Content.Server.Dice
             base.Initialize();
 
             SubscribeLocalEvent<DiceComponent, ComponentInit>(OnComponentInit);
-            SubscribeLocalEvent<DiceComponent, ActivateInWorldEvent>(OnActivate);
+            SubscribeLocalEvent<DiceComponent, UseInHandEvent>(OnUseInHand);
             SubscribeLocalEvent<DiceComponent, LandEvent>(OnLand);
             SubscribeLocalEvent<DiceComponent, ExaminedEvent>(OnExamined);
         }
@@ -36,8 +36,11 @@ namespace Content.Server.Dice
                 component.CurrentSide = component.Sides;
         }
 
-        private void OnActivate(EntityUid uid, DiceComponent component, ActivateInWorldEvent args)
+        private void OnUseInHand(EntityUid uid, DiceComponent component, UseInHandEvent args)
         {
+            if (args.Handled) return;
+
+            args.Handled = true;
             Roll(uid, component);
         }