diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp
index aa8d7a4fee..3610efa7cc 100644
--- a/audio-mixer/src/main.cpp
+++ b/audio-mixer/src/main.cpp
@@ -93,6 +93,9 @@ int main(int argc, const char* argv[]) {
 
     sockaddr *agentAddress = new sockaddr;
 
+    // make sure our agent socket is non-blocking
+    agentList->getAgentSocket().setBlocking(false);
+    
     int nextFrame = 0;
     timeval startTime;