diff --git a/forge/comms/commsClient.js b/forge/comms/commsClient.js
index 9c43ccd784..aa8e2788b9 100644
--- a/forge/comms/commsClient.js
+++ b/forge/comms/commsClient.js
@@ -52,7 +52,7 @@ class CommsClient extends EventEmitter {
                 const ownerId = topicParts[4]
                 const messageType = topicParts[5]
 
-                if (topicParts[2] === 'browser') {
+                if (topicParts[2] === 'browser' && topicParts[3] === 'tab-presence') {
                     // ff/v1/browser/tab-presence/<userId>/<sessionId>/<messageType>
                     const userId = topicParts[4]
                     const sessionId = topicParts[5]
diff --git a/frontend/src/publishers/tab-presence.publisher.ts b/frontend/src/publishers/tab-presence.publisher.ts
index 1db59f9884..afcc790c71 100644
--- a/frontend/src/publishers/tab-presence.publisher.ts
+++ b/frontend/src/publishers/tab-presence.publisher.ts
@@ -73,7 +73,7 @@ class TabPresencePublisher extends TeamPublisher {
 
     private _publishHeartbeat (): void {
         if (!this.$userId || !this.$sessionId) return
-        const topic = `ff/v1/tab-presence/${this.$userId}/${this.$sessionId}/heartbeat`
+        const topic = `ff/v1/browser/tab-presence/${this.$userId}/${this.$sessionId}/heartbeat`
         this._publish(topic, {
             visibility: document.visibilityState,
             focused: document.hasFocus()
@@ -83,7 +83,7 @@ class TabPresencePublisher extends TeamPublisher {
     private _publishContext (): void {
         if (!this.$userId || !this.$sessionId) return
         const contextStore = useContextStore()
-        const topic = `ff/v1/tab-presence/${this.$userId}/${this.$sessionId}/context`
+        const topic = `ff/v1/browser/tab-presence/${this.$userId}/${this.$sessionId}/context`
         this._publish(topic, contextStore.expert).catch(() => {})
     }