diff --git a/frontend/app/player/web/assist/AssistManager.ts b/frontend/app/player/web/assist/AssistManager.ts
index 1d3fd8822..d7d1bfef4 100644
--- a/frontend/app/player/web/assist/AssistManager.ts
+++ b/frontend/app/player/web/assist/AssistManager.ts
@@ -172,7 +172,8 @@ export default class AssistManager {
 
       socket.on('messages', messages => {
         const isOldVersion = messages.meta.version === 1
-        this.assistVersion = messages.meta.version
+        this.assistVersion = isOldVersion ? 1 : 2
+
         const data = messages.data || messages
         jmr.append(data) // as RawMessage[]
         if (waitingForMessages) {
diff --git a/frontend/app/player/web/assist/Call.ts b/frontend/app/player/web/assist/Call.ts
index a702c3692..002697fad 100644
--- a/frontend/app/player/web/assist/Call.ts
+++ b/frontend/app/player/web/assist/Call.ts
@@ -237,6 +237,7 @@ export default class Call {
 			console.warn('No tab data to connect to peer')
 		}
 		const peerId = this.getAssistVersion() === 1 ? this.peerID : `${this.peerID}-${tab || Object.keys(this.store.get().tabs)[0]}`
+		console.log(peerId, this.getAssistVersion())
 		void this._peerConnection(peerId);
 		this.emitData("_agent_name", appStore.getState().getIn([ 'user', 'account', 'name']))
 	}
diff --git a/frontend/app/player/web/assist/RemoteControl.ts b/frontend/app/player/web/assist/RemoteControl.ts
index 7e98d995e..fd62315d1 100644
--- a/frontend/app/player/web/assist/RemoteControl.ts
+++ b/frontend/app/player/web/assist/RemoteControl.ts
@@ -56,7 +56,7 @@ export default class RemoteControl {
   }
 
   private emitData = (event: string, data?: any) => {
-    if (this.getAssistVersion()) {
+    if (this.getAssistVersion() === 1) {
       this.socket.emit(event, data)
     } else {
       this.socket.emit(event, { meta: { tabId: this.store.get().currentTab }, data })
diff --git a/frontend/app/player/web/assist/ScreenRecording.ts b/frontend/app/player/web/assist/ScreenRecording.ts
index 3a7c71947..c5633d92b 100644
--- a/frontend/app/player/web/assist/ScreenRecording.ts
+++ b/frontend/app/player/web/assist/ScreenRecording.ts
@@ -37,8 +37,6 @@ export default class ScreenRecording {
     socket.on('recording_busy', () => {
       this.onRecordingBusy()
     })
-
-    this.assistVersion = getAssistVersion()
 	}
 
 	private onRecordingBusy = () => {
@@ -59,7 +57,7 @@ export default class ScreenRecording {
   }
 
   private emitData = (event: string, data?: any) => {
-    if (this.assistVersion === 1) {
+    if (this.getAssistVersion() === 1) {
       this.socket.emit(event, data)
     } else {
       this.socket.emit(event, { meta: { tabId: this.store.get().currentTab }, data })