diff --git a/lib/service/rabbitmq.go b/lib/service/rabbitmq.go
index 62c6a2c..6f51a47 100644
--- a/lib/service/rabbitmq.go
+++ b/lib/service/rabbitmq.go
@@ -63,7 +63,7 @@ func (svc *LndhubService) StartRabbitMqPublisher(ctx context.Context) error {
 	for {
 		select {
 		case <-ctx.Done():
-			return fmt.Errorf("context canceled")
+			return context.Canceled
 		case incoming := <-incomingInvoices:
 			svc.publishInvoice(ctx, incoming, ch)
 		case outgoing := <-outgoingInvoices:
diff --git a/main.go b/main.go
index 983d196..0fa7c86 100644
--- a/main.go
+++ b/main.go
@@ -209,9 +209,15 @@ func main() {
 	}
 	//Start rabbit publisher
 	if svc.Config.RabbitMQUri != "" {
-		rabbitCtx, cancelRabbit := context.WithCancel(context.Background())
-		go svc.StartRabbitMqPublisher(rabbitCtx)
-		defer cancelRabbit()
+		backgroundWg.Add(1)
+		go func() {
+			err = svc.StartRabbitMqPublisher(backGroundCtx)
+			if err != nil {
+				svc.Logger.Error(err)
+				sentry.CaptureException(err)
+			}
+			backgroundWg.Done()
+		}()
 	}
 
 	var grpcServer *grpc.Server