diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index 6bb16b7c46..cd9a56c83d 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@@ -26,9 +26,9 @@ EntityServer::EntityServer(NLPacket& packet) :
     _entitySimulation(NULL)
 {
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerPacketListener(PacketType::EntityAdd, this, "handleEntityAddPacket");
-    packetReceiver.registerPacketListener(PacketType::EntityEdit, this, "handleEntityEditPacket");
-    packetReceiver.registerPacketListener(PacketType::EntityErase, this, "handleEntityErasePacket");
+    packetReceiver.registerPacketListener(
+        { PacketType::EntityAdd, PacketType::EntityEdit, PacketType::EntityErase },
+        this, "handleEntityPacket");
 }
 
 EntityServer::~EntityServer() {
@@ -41,19 +41,7 @@ EntityServer::~EntityServer() {
     tree->removeNewlyCreatedHook(this);
 }
 
-void EntityServer::handleEntityAddPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
-    if (_octreeInboundPacketProcessor) {
-        _octreeInboundPacketProcessor->queueReceivedPacket(packet, senderNode);
-    }
-}
-
-void EntityServer::handleEntityEditPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
-    if (_octreeInboundPacketProcessor) {
-        _octreeInboundPacketProcessor->queueReceivedPacket(packet, senderNode);
-    }
-}
-
-void EntityServer::handleEntityErasePacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
+void EntityServer::handleEntityPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
     if (_octreeInboundPacketProcessor) {
         _octreeInboundPacketProcessor->queueReceivedPacket(packet, senderNode);
     }
diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h
index dde68dfebd..1c4eda3cc0 100644
--- a/assignment-client/src/entities/EntityServer.h
+++ b/assignment-client/src/entities/EntityServer.h
@@ -50,9 +50,7 @@ protected:
     virtual Octree* createTree();
 
 private slots:
-    void handleEntityAddPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
-    void handleEntityEditPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
-    void handleEntityErasePacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
+    void handleEntityPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode);
 
 private:
     EntitySimulation* _entitySimulation;