diff --git a/Content.Server/_CP14/Farming/CP14FarmingSystem.Resourse.cs b/Content.Server/_CP14/Farming/CP14FarmingSystem.Resourse.cs
index c431f94d7f..97aba4d508 100644
--- a/Content.Server/_CP14/Farming/CP14FarmingSystem.Resourse.cs
+++ b/Content.Server/_CP14/Farming/CP14FarmingSystem.Resourse.cs
@@ -28,7 +28,7 @@ public sealed partial class CP14FarmingSystem
     private void OnTakeEnergyFromLight(Entity<CP14PlantEnergyFromLightComponent> regeneration, ref CP14PlantUpdateEvent args)
     {
         var gainEnergy = false;
-        var daylight = _dayCycle.TryDaylightThere(regeneration, true);
+        var daylight = _dayCycle.UnderSunlight(regeneration);
 
         if (regeneration.Comp.Daytime && daylight)
             gainEnergy = true;
diff --git a/Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs b/Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs
index a723067ecd..f39cbda176 100644
--- a/Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs
+++ b/Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs
@@ -68,7 +68,7 @@ public sealed class CP14VampireRuleSystem : GameRuleSystem<CP14VampireRuleCompon
 
             vampire.NextHeatTime = _timing.CurTime + vampire.HeatFrequency;
 
-            if (!_dayCycle.TryDaylightThere(uid))
+            if (!_dayCycle.UnderSunlight(uid))
                 continue;
 
             _temperature.ChangeHeat(uid, vampire.HeatUnderSunTemperature);
diff --git a/Content.Server/_CP14/MagicEnergy/CP14MagicEnergySystem.Draw.cs b/Content.Server/_CP14/MagicEnergy/CP14MagicEnergySystem.Draw.cs
index 31e4a96d22..1f24106e8e 100644
--- a/Content.Server/_CP14/MagicEnergy/CP14MagicEnergySystem.Draw.cs
+++ b/Content.Server/_CP14/MagicEnergy/CP14MagicEnergySystem.Draw.cs
@@ -67,7 +67,7 @@ public partial class CP14MagicEnergySystem
 
             draw.NextUpdateTime = _gameTiming.CurTime + TimeSpan.FromSeconds(draw.Delay);
 
-            ChangeEnergy(uid, _dayCycle.TryDaylightThere(uid) ? draw.DaylightEnergy : draw.DarknessEnergy, out _, out _, magicContainer, true);
+            ChangeEnergy(uid, _dayCycle.UnderSunlight(uid) ? draw.DaylightEnergy : draw.DarknessEnergy, out _, out _, magicContainer, true);
         }
     }
 
diff --git a/Content.Shared/_CP14/DayCycle/CP14SharedDayCycleSystem.cs b/Content.Shared/_CP14/DayCycle/CP14SharedDayCycleSystem.cs
index 906868d701..cbd7443dca 100644
--- a/Content.Shared/_CP14/DayCycle/CP14SharedDayCycleSystem.cs
+++ b/Content.Shared/_CP14/DayCycle/CP14SharedDayCycleSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared._CP14.DayCycle.Components;
 using Content.Shared._CP14.DayCycle.Prototypes;
 using Content.Shared.Maps;
+using Content.Shared.Storage.Components;
 using Content.Shared.Weather;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -30,14 +31,18 @@ public abstract class CP14SharedDayCycleSystem : EntitySystem
     /// </summary>
     /// <param name="target">An entity being tested to see if it is in daylight</param>
     /// <param name="checkRoof">Checks if the tile covers the weather (the only "roof" factor at the moment)</param>
-    public bool TryDaylightThere(EntityUid target, bool checkRoof = true)
+    public bool UnderSunlight(EntityUid target)
     {
+        if (HasComp<InsideEntityStorageComponent>(target))
+            return false;
+
         var xform = Transform(target);
         if (!TryComp<CP14DayCycleComponent>(xform.MapUid, out var dayCycle))
             return false;
 
         var day = dayCycle.CurrentPeriod == DayPeriod;
-        if (!checkRoof || !TryComp<MapGridComponent>(xform.GridUid, out var mapGrid))
+
+        if (!TryComp<MapGridComponent>(xform.GridUid, out var mapGrid))
             return day;
 
         var grid = xform.GridUid;
diff --git a/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellCasterTeleport.cs b/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellCasterTeleport.cs
index c3359f2784..e0b27cd4c3 100644
--- a/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellCasterTeleport.cs
+++ b/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellCasterTeleport.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Popups;
 using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
 
 namespace Content.Shared._CP14.MagicSpell.Spells;