diff --git a/scripts/peer-connection.js b/scripts/peer-connection.js
index ce83bef..937e7cb 100644
--- a/scripts/peer-connection.js
+++ b/scripts/peer-connection.js
@@ -1,6 +1,7 @@
-/* global log, PeerConnections, handleTransceiverForInsertableStreams, handleTransceiverForPlayoutDelayHint */
+/* global log, PeerConnections, handleTransceiverForInsertableStreams, handleTransceiverForPlayoutDelayHint, videoEndToEndDelayStats */
 
 const timestampInsertableStreams = !!window.PARAMS?.timestampInsertableStreams
+const timestampWatermark = !!window.PARAMS?.timestampWatermark
 
 const NativeRTCPeerConnection = window.RTCPeerConnection
 
@@ -84,11 +85,19 @@ window.RTCPeerConnection = function (options) {
   pc.addEventListener('track', event => {
     //log(`RTCPeerConnection-${id} track`)
     const { receiver, transceiver } = event
-    if (receiver?.track && !receiver._encodedStreams) {
+    if (receiver?.track) {
       //log(`RTCPeerConnection-${id} ontrack`, track.kind, event)
       if (timestampInsertableStreams) {
         handleTransceiverForInsertableStreams(id, transceiver)
       }
+      if (timestampWatermark) {
+        window.recognizeTimestampWatermark(
+          receiver?.track,
+          ({ timestamp, delay }) => {
+            videoEndToEndDelayStats.push(timestamp, delay)
+          },
+        )
+      }
     }
     handleTransceiverForPlayoutDelayHint(id, transceiver, 'track')
   })
diff --git a/src/session.ts b/src/session.ts
index ef3180c..0df7f46 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -790,6 +790,8 @@ export class Session extends EventEmitter {
 
     const page = await this.getNewPage(tabIndex)
 
+    await page.setBypassCSP(true)
+
     if (this.userAgent) {
       await page.setUserAgent(this.userAgent)
     }