diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index 5bfb4000..113db808 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -641,21 +641,7 @@ void Server::parsePlayerTransform(Packet& packet)
 
 bool Server::shouldSendToClient(EntityWrapper childEntity)
 {
-    auto children = m_World->GetDirectChildren(childEntity.ID);
-    for (auto it = children.first; it != children.second; it++) {
-        EntityWrapper child(m_World, it->second);
-        if (child.HasComponent("CapturePoint") || child.HasComponent("HealthPickup")
-            || child.HasComponent("AmmoPickup")) {
-            return true;
-        }
-    }
-    return childEntity.HasComponent("Player") 
-        || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint") 
-        || childEntity.HasComponent("HealthPickup")
-        || childEntity.HasComponent("AmmoPickup")
-        || childEntity.HasComponent("ScoreScreen")
-        || childEntity.FirstParentWithComponent("ScoreScreen").Valid();
+    return childEntity.HasComponent("NetworkComponent") ||childEntity.FirstParentWithComponent("Player").Valid();
 }
 
 PlayerID Server::getPlayerIDFromEndpoint()