diff --git a/rpc/amqp-rpc.go b/rpc/amqp-rpc.go
index 5ec5882ec..6cb9637e1 100644
--- a/rpc/amqp-rpc.go
+++ b/rpc/amqp-rpc.go
@@ -396,11 +396,9 @@ func (rpc *AmqpRPCServer) Start(c cmd.Config) error {
 				if ok {
 					rpc.processMessage(msg)
 				} else {
+					// chan has been closed by rpc.channel.Cancel
 					rpc.log.Info(" [!] Finished processing messages")
-					rpc.dMu.Lock()
-					rpc.done = true
-					rpc.dMu.Unlock()
-					blocking = false
+					return nil
 				}
 			case err = <-closeChan:
 				rpc.connected = false