diff --git a/Content.Shared/Emag/Systems/EmagSystem.cs b/Content.Shared/Emag/Systems/EmagSystem.cs
index 360cfa3141..dc1225577e 100644
--- a/Content.Shared/Emag/Systems/EmagSystem.cs
+++ b/Content.Shared/Emag/Systems/EmagSystem.cs
@@ -164,7 +164,7 @@ namespace Content.Shared.Emag.Systems
             var emaggedEvent = new GotEmaggedEvent(user);
             RaiseLocalEvent(target, ref emaggedEvent);
 
-            if (!emaggedEvent.Repeatable)
+            if (emaggedEvent.Handled && !emaggedEvent.Repeatable)
                 EnsureComp<EmaggedComponent>(target);
             return emaggedEvent.Handled;
         }