diff --git a/Content.MapRenderer/Painters/GridPainter.cs b/Content.MapRenderer/Painters/GridPainter.cs
index e46ff81b5a..fe2b392af9 100644
--- a/Content.MapRenderer/Painters/GridPainter.cs
+++ b/Content.MapRenderer/Painters/GridPainter.cs
@@ -73,7 +73,7 @@ namespace Content.MapRenderer.Painters
 
             foreach (var entity in _sEntityManager.GetEntities())
             {
-                if (!_sEntityManager.HasComponent<SpriteComponent>(entity))
+                if (!_cEntityManager.TryGetComponent(entity, out SpriteComponent? sprite))
                 {
                     continue;
                 }
@@ -84,12 +84,6 @@ namespace Content.MapRenderer.Painters
                     continue;
                 }
 
-                if (!_cEntityManager.TryGetComponent(entity, out SpriteComponent? sprite))
-                {
-                    throw new InvalidOperationException(
-                        $"No sprite component found on an entity for which a server sprite component exists. Prototype id: {prototype.ID}");
-                }
-
                 var transform = _sEntityManager.GetComponent<TransformComponent>(entity);
                 if (_cMapManager.TryGetGrid(transform.GridUid, out var grid))
                 {