diff --git a/Content.Server/_White/Implants/Mindslave/MindslaveSystem.cs b/Content.Server/_White/Implants/Mindslave/MindslaveSystem.cs
index d2e1f7e733..80838ba8ae 100644
--- a/Content.Server/_White/Implants/Mindslave/MindslaveSystem.cs
+++ b/Content.Server/_White/Implants/Mindslave/MindslaveSystem.cs
@@ -69,6 +69,11 @@ public sealed class MindslaveSystem : SharedMindslaveSystem
 
     private void OnMindslaveRemoved(Entity<SubdermalImplantComponent> ent, ref SubdermalImplantRemoved args)
     {
+        if (!Tag.HasTag(ent.Owner, MindslaveTag))
+        {
+            return;
+        }
+        
         if (!TryComp(args.Target, out MindSlaveComponent? mindslave))
         {
             return;