diff --git a/clientlibrary/worker/worker.go b/clientlibrary/worker/worker.go
index 132c123..f14eec0 100644
--- a/clientlibrary/worker/worker.go
+++ b/clientlibrary/worker/worker.go
@@ -115,8 +115,12 @@ func (w *Worker) Start() error {
 	}
 
 	log.Infof("Starting worker event loop.")
-	// entering event loop
-	go w.eventLoop()
+	w.waitGroup.Add(1)
+	go func() {
+		defer w.waitGroup.Done()
+		// entering event loop
+		w.eventLoop()
+	}()
 	return nil
 }