diff --git a/events/producer/handler.go b/events/producer/handler.go
index 57befb82308..4ffe8e2022d 100644
--- a/events/producer/handler.go
+++ b/events/producer/handler.go
@@ -25,7 +25,6 @@ import (
 
 type handler struct {
 	ChatStream       pb.Events_ChatServer
-	doneChan         chan bool
 	interestedEvents map[string]*pb.Interest
 }
 
@@ -34,7 +33,6 @@ func newEventHandler(stream pb.Events_ChatServer) (*handler, error) {
 		ChatStream: stream,
 	}
 	d.interestedEvents = make(map[string]*pb.Interest)
-	d.doneChan = make(chan bool)
 	return d, nil
 }
 
@@ -42,7 +40,6 @@ func newEventHandler(stream pb.Events_ChatServer) (*handler, error) {
 func (d *handler) Stop() error {
 	d.deregisterAll()
 	d.interestedEvents = nil
-	d.doneChan <- true
 	return nil
 }
 
diff --git a/events/producer/producer.go b/events/producer/producer.go
index 4e70d0fd56a..85508b936fe 100644
--- a/events/producer/producer.go
+++ b/events/producer/producer.go
@@ -68,7 +68,7 @@ func (p *EventsServer) Chat(stream pb.Events_ChatServer) error {
 		err = handler.HandleMessage(in)
 		if err != nil {
 			producerLogger.Errorf("Error handling message: %s", err)
-			//return err
+			return err
 		}
 
 	}