diff --git a/pkg/coordinator/handlers.go b/pkg/coordinator/handlers.go
index e314289f..e37311ef 100644
--- a/pkg/coordinator/handlers.go
+++ b/pkg/coordinator/handlers.go
@@ -189,7 +189,7 @@ func (s *Server) WS(w http.ResponseWriter, r *http.Request) {
 		if workerId != "" {
 			if xid_, err := xid.FromString(workerId); err == nil {
 				if s.cfg.Coordinator.Debug {
-					for _, w := range s.workerClients {
+					for _, w := range s.getAvailableWorkers() {
 						if xid_ == w.Id {
 							wc = w
 							bc.Printf("[!] Worker found: %v", xid_)
@@ -197,7 +197,7 @@ func (s *Server) WS(w http.ResponseWriter, r *http.Request) {
 						}
 					}
 				} else {
-					for _, w := range s.workerClients {
+					for _, w := range s.getAvailableWorkers() {
 						if bytes.Equal(xid_.Machine(), w.Id.Machine()) {
 							wc = w
 							bc.Printf("[!] Machine %v found: %v", xid_.Machine(), xid_)