diff --git a/events/emitter.go b/events/emitter.go
index ed3902146..d69105647 100644
--- a/events/emitter.go
+++ b/events/emitter.go
@@ -47,7 +47,9 @@ func (e *Emitter) Events(ctx context.Context, clientID string) chan *events.Enve
 			ns: ns,
 		}
 		e.sinks[clientID] = s
+		e.m.Unlock()
 		e.broadcaster.Add(s)
+		return s.ch
 	}
 	ch := e.sinks[clientID].ch
 	e.m.Unlock()