diff --git a/exec/commservice.js b/exec/commservice.js
index ca195365f5b486f6977c6c6a75c2af568b511ace..817512244170093ad65a9ef11b103bc61aecf0f5 100644
--- a/exec/commservice.js
+++ b/exec/commservice.js
@@ -216,7 +216,7 @@ function queue(sock,data)
 			}
 			break;
 	}
-	if(modules[data.id] && modules[data.id].handler) {
+	if(!server_map[data.id] && modules[data.id] && modules[data.id].handler) {
 		modules[data.id].handler(data);
 	}
 }
@@ -536,6 +536,9 @@ function Server(addr,port)
 					queue(this.sock,data);
 					break;
 			}
+			if(modules[data.id] && modules[data.id].handler) {
+				modules[data.id].handler(data);
+			}
 		}
 	}
 	this.enqueue=function(data)