diff --git a/lnrpc/routerrpc/router_server.go b/lnrpc/routerrpc/router_server.go
index a294c999f..fd3f5e6cf 100644
--- a/lnrpc/routerrpc/router_server.go
+++ b/lnrpc/routerrpc/router_server.go
@@ -872,10 +872,17 @@ func (s *Server) trackPayment(subscription routing.ControlTowerSubscriber,
 		stream.Context(), subscription, noInflightUpdates, stream.Send,
 	)
 
+	// If the context is canceled, we don't return an error.
 	if errors.Is(err, context.Canceled) {
-		log.Debugf("Payment stream %v canceled", identifier)
+		log.Infof("Payment stream %v canceled", identifier)
+
+		return nil
 	}
 
+	// Otherwise, we will log and return the error as the stream has
+	// received an error from the payment lifecycle.
+	log.Errorf("TrackPayment got error for payment %x: %v", identifier, err)
+
 	return err
 }