diff --git a/WebApp/src/lib/app/controller.js b/WebApp/src/lib/app/controller.js
index 5772f36..295a05e 100644
--- a/WebApp/src/lib/app/controller.js
+++ b/WebApp/src/lib/app/controller.js
@@ -1567,7 +1567,12 @@ const connectSocket = () => {
 
 		if (payload.cameraDeviceId === currentState.activeCameraDeviceId) {
 			setAppState({ activeStreamSessionId: payload.streamSessionId });
-			setClientStreamMode('connecting');
+			if (remoteStreams.has(payload.streamSessionId)) {
+				attachClientStreamToElement();
+				setClientStreamMode('video');
+			} else {
+				setClientStreamMode('connecting');
+			}
 		}
 
 		streamTimers.set(