diff --git a/mixer/src/main.cpp b/mixer/src/main.cpp
index b1e159bddf..ea97e85d0e 100644
--- a/mixer/src/main.cpp
+++ b/mixer/src/main.cpp
@@ -286,7 +286,11 @@ int main(int argc, const char * argv[])
                 
                 // add or update the existing interface agent
                 if (!LOOPBACK_SANITY_CHECK) {
-                    agentList.addOrUpdateAgent(agentAddress, agentAddress, packetData[0]);
+                    
+                    if (agentList.addOrUpdateAgent(agentAddress, agentAddress, packetData[0], agentList.getLastAgentId())) {
+                        agentList.increaseAgentId();
+                    }
+                    
                     agentList.updateAgentWithData(agentAddress, (void *)packetData, receivedBytes);
                 } else {
                     memcpy(loopbackAudioPacket, packetData + 1 + (sizeof(float) * 4), 1024);
diff --git a/voxel/src/main.cpp b/voxel/src/main.cpp
index 8fe9154ab0..28cf559322 100644
--- a/voxel/src/main.cpp
+++ b/voxel/src/main.cpp
@@ -139,7 +139,11 @@ int main(int argc, const char * argv[])
     while (true) {
         if (agentList.getAgentSocket().receive(&agentPublicAddress, packetData, &receivedBytes)) {
             if (packetData[0] == 'H') {
-                agentList.addOrUpdateAgent(&agentPublicAddress, &agentPublicAddress, packetData[0]);
+                
+                if (agentList.addOrUpdateAgent(&agentPublicAddress, &agentPublicAddress, packetData[0], agentList.getLastAgentId())) {
+                    agentList.increaseAgentId();
+                }
+                
                 agentList.updateAgentWithData(&agentPublicAddress, (void *)packetData, receivedBytes);
                 
                 VoxelAgentData *agentData = (VoxelAgentData *) agentList.getAgents()[agentList.indexOfMatchingAgent(&agentPublicAddress)].getLinkedData();