diff --git a/Robust.Shared/GameObjects/EntityManager.Components.cs b/Robust.Shared/GameObjects/EntityManager.Components.cs
index cbbcc9a6f17..fa603b95488 100644
--- a/Robust.Shared/GameObjects/EntityManager.Components.cs
+++ b/Robust.Shared/GameObjects/EntityManager.Components.cs
@@ -88,14 +88,13 @@ private void RegisterComponents(IEnumerable<ComponentRegistration> components)
         /// <inheritdoc />
         public int Count<T>() where T : IComponent
         {
-            return _world.CountEntities(new QueryDescription().WithAll<T>());
+            return _entTraitArray[CompIdx.ArrayIndex<T>()].Count;
         }
 
         /// <inheritdoc />
         public int Count(Type component)
         {
-            var query = new QueryDescription([component]);
-            return _world.CountEntities(in query);
+            return _entTraitArray[_componentFactory.GetArrayIndex(component)].Count;
         }
 
         [Obsolete("Use InitializeEntity")]