diff --git a/AUTHORS b/AUTHORS
index b8c58ab09a..014748e187 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,6 +28,7 @@ Anthony Bishopric <git@anthonybishopric.com>
 Anton Nikitin <anton.k.nikitin@gmail.com>
 Antony Messerli <amesserl@rackspace.com>
 apocas <petermdias@gmail.com>
+Arnaud Porterie <arnaud.porterie@gmail.com>
 Asbjørn Enge <asbjorn@hanafjedle.net>
 Barry Allard <barry.allard@gmail.com>
 Bartłomiej Piotrowski <b@bpiotrowski.pl>
diff --git a/server/server.go b/server/server.go
index d82c5fe549..cab11bcf50 100644
--- a/server/server.go
+++ b/server/server.go
@@ -259,7 +259,10 @@ func (srv *Server) Events(job *engine.Job) engine.Status {
 	}
 	for {
 		select {
-		case event := <-listener:
+		case event, ok := <-listener:
+			if !ok { // Channel is closed: listener was evicted
+				return engine.StatusOK
+			}
 			err := sendEvent(&event)
 			if err != nil && err.Error() == "JSON error" {
 				continue