diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index 553484dfc7..1148f31c6a 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -96,7 +96,8 @@ int main(int argc, const char * argv[])
     agentList->startSilentAgentRemovalThread();
     
     while (true) {
-        if (agentList->getAgentSocket().receive((sockaddr *)&agentPublicAddress, packetData, &receivedBytes)) {
+        if (agentList->getAgentSocket().receive((sockaddr *)&agentPublicAddress, packetData, &receivedBytes) &&
+            (packetData[0] == PACKET_HEADER_DOMAIN_RFD) || (packetData[0] == PACKET_HEADER_DOMAIN_LIST_REQUEST)) {
             std::map<char, Agent *> newestSoloAgents;
             
             agentType = packetData[1];