diff --git a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs
index 46d90d7640..4faabfe44b 100644
--- a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs
@@ -33,8 +33,11 @@ namespace Content.Server.GameObjects.EntitySystems
 
         public IGridAtmosphereComponent? GetGridAtmosphere(GridId gridId)
         {
+            // TODO Return space grid atmosphere for invalid grids or grids with no atmos
             var grid = _mapManager.GetGrid(gridId);
-            var gridEnt = _entityManager.GetEntity(grid.GridEntityId);
+
+            if (!_entityManager.TryGetEntity(grid.GridEntityId, out var gridEnt)) return null;
+
             return gridEnt.TryGetComponent(out IGridAtmosphereComponent atmos) ? atmos : null;
         }