diff --git a/workspace/popjava/src/popjava/broker/Broker.java b/workspace/popjava/src/popjava/broker/Broker.java
index e810c5a1..e8308986 100644
--- a/workspace/popjava/src/popjava/broker/Broker.java
+++ b/workspace/popjava/src/popjava/broker/Broker.java
@@ -843,13 +843,10 @@ public POPAccessPoint getAccessPoint() {
 	public void treatRequests() throws InterruptedException { 
 		setState(State.Running);
 		while (getState() == State.Running) {
-			for (ComboxServer comboxServer : comboxServers) {
-				Request request = comboxServer.getRequestQueue().peek(REQUEST_QUEUE_TIMEOUT_MS,
-						TimeUnit.MILLISECONDS);
-
-				if (request != null) {
-					serveRequest(request);
-				}
+			Request request = requestQueue.peek(REQUEST_QUEUE_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+			
+			if (request != null) {
+				serveRequest(request);
 			}
 		}
 		LogWriter.writeDebugInfo("[Broker] Close broker "+popInfo.getClassName());