diff --git a/Content.Shared/_CP14/MagicSpellStorage/CP14SpellStorageSystem.cs b/Content.Shared/_CP14/MagicSpellStorage/CP14SpellStorageSystem.cs
index 0ec0595de2..d9b5709278 100644
--- a/Content.Shared/_CP14/MagicSpellStorage/CP14SpellStorageSystem.cs
+++ b/Content.Shared/_CP14/MagicSpellStorage/CP14SpellStorageSystem.cs
@@ -56,7 +56,7 @@ public sealed partial class CP14SpellStorageSystem : EntitySystem
             storage.Comp.SpellEntities.Add(spellEnt.Value);
         }
         if (storage.Comp.GrantAccessToSelf)
-            _actions.GrantActions(storage, storage.Comp.SpellEntities, storage);
+            _actions.GrantActions(storage.Owner, storage.Comp.SpellEntities, storage.Owner);
     }
 
     private void OnMagicStorageShutdown(Entity<CP14SpellStorageComponent> mStorage, ref ComponentShutdown args)
@@ -78,7 +78,7 @@ public sealed partial class CP14SpellStorageSystem : EntitySystem
         if (mind.OwnedEntity is null)
             return false;
 
-        _actions.GrantActions(user, storage.Comp.SpellEntities, storage);
+        _actions.GrantActions(user, storage.Comp.SpellEntities, storage.Owner);
         return true;
     }
 }
diff --git a/Content.Shared/_CP14/NightVision/CP14SharedNightVisionSystem.cs b/Content.Shared/_CP14/NightVision/CP14SharedNightVisionSystem.cs
index 439367fab3..34ae16191c 100644
--- a/Content.Shared/_CP14/NightVision/CP14SharedNightVisionSystem.cs
+++ b/Content.Shared/_CP14/NightVision/CP14SharedNightVisionSystem.cs
@@ -21,7 +21,7 @@ public abstract class CP14SharedNightVisionSystem : EntitySystem
 
     protected virtual void OnRemove(Entity<CP14NightVisionComponent> ent, ref ComponentRemove args)
     {
-        _actions.RemoveAction(ent, ent.Comp.ActionEntity);
+        _actions.RemoveAction(ent.Owner, ent.Comp.ActionEntity);
     }
 }