diff --git a/src/bus-publisher.ts b/src/bus-publisher.ts
index 86bb8a3..c9cd1db 100644
--- a/src/bus-publisher.ts
+++ b/src/bus-publisher.ts
@@ -39,7 +39,7 @@ export class BusPublisher {
     else if (cumulative >= config.softLimit) status = "soft_exceeded";
 
     try {
-      await this.bus.publish(`tbg/${sessionID}/status`, {
+      await this.bus.forService("tbg").forSession(sessionID).publish("status", {
         sessionID,
         cumulative,
         softLimit: config.softLimit,
diff --git a/src/tui.tsx b/src/tui.tsx
index 5ddd20a..d2c180b 100644
--- a/src/tui.tsx
+++ b/src/tui.tsx
@@ -27,7 +27,7 @@ function TokenMeterView(props: { session_id: string }) {
       const bus = await BusTui.connect(5000);
       setConnected(true);
 
-      bus.subscribe(`tbg/${props.session_id}/status`, (msg) => {
+      bus.forService("tbg").forSession(props.session_id).subscribe("status", (msg) => {
         const p = msg.payload as any;
         if (typeof p.cumulative === "number") {
           setTokens(p.cumulative);