diff --git a/Content.Client/Decals/DecalOverlay.cs b/Content.Client/Decals/DecalOverlay.cs
index 6cde83158e..d786885e5c 100644
--- a/Content.Client/Decals/DecalOverlay.cs
+++ b/Content.Client/Decals/DecalOverlay.cs
@@ -14,7 +14,6 @@ namespace Content.Client.Decals
         private readonly SharedTransformSystem _transform;
         private readonly SpriteSystem _sprites;
         private readonly IEntityManager _entManager;
-        private readonly IMapManager _mapManager;
         private readonly IPrototypeManager _prototypeManager;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities;
@@ -26,14 +25,12 @@ namespace Content.Client.Decals
             SharedTransformSystem transforms,
             SpriteSystem sprites,
             IEntityManager entManager,
-            IMapManager mapManager,
             IPrototypeManager prototypeManager)
         {
             _decals = decals;
             _transform = transforms;
             _sprites = sprites;
             _entManager = entManager;
-            _mapManager = mapManager;
             _prototypeManager = prototypeManager;
         }
 
@@ -47,7 +44,14 @@ namespace Content.Client.Decals
             {
                 if (zIndexDictionary.Count == 0) continue;
 
-                var xform = xformQuery.GetComponent(gridId);
+                if (!xformQuery.TryGetComponent(gridId, out var xform))
+                {
+                    Logger.Error($"Tried to draw decals on a non-existent grid. GridUid: {gridId}");
+                    continue;
+                }
+
+                if (xform.MapID != args.MapId)
+                    continue;
 
                 handle.SetTransform(_transform.GetWorldMatrix(xform, xformQuery));
 
diff --git a/Content.Client/Decals/DecalSystem.cs b/Content.Client/Decals/DecalSystem.cs
index d70c5cf45b..47d5399761 100644
--- a/Content.Client/Decals/DecalSystem.cs
+++ b/Content.Client/Decals/DecalSystem.cs
@@ -19,7 +19,7 @@ namespace Content.Client.Decals
         {
             base.Initialize();
 
-            _overlay = new DecalOverlay(this, _transforms, _sprites, EntityManager, MapManager, PrototypeManager);
+            _overlay = new DecalOverlay(this, _transforms, _sprites, EntityManager, PrototypeManager);
             _overlayManager.AddOverlay(_overlay);
 
             SubscribeNetworkEvent<DecalChunkUpdateEvent>(OnChunkUpdate);