diff --git a/package.json b/package.json
index b7f191b6..8e7f0e9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@highlight-run/rrweb",
-  "version": "0.9.25",
+  "version": "0.9.26",
   "description": "record and replay the web",
   "scripts": {
     "test": "npm run bundle:browser && cross-env TS_NODE_CACHE=false TS_NODE_FILES=true mocha -r ts-node/register test/**/*.test.ts",
diff --git a/src/replay/index.ts b/src/replay/index.ts
index 02a07561..6e331d52 100644
--- a/src/replay/index.ts
+++ b/src/replay/index.ts
@@ -102,7 +102,6 @@ export class Replayer {
   private emitter: Emitter = mitt();
 
   private inactiveEndTimestamp: number | null;
-  private nextUserInteractionEvent: eventWithTime | null;
 
   // tslint:disable-next-line: variable-name
   private legacy_missingNodeRetryMap: missingNodeMap = {};
@@ -247,17 +246,21 @@ export class Replayer {
     }
     // Preprocessing to get all active/inactive segments in a session
     const allIntervals: Array<SessionInterval> = [];
-    const firstEvent = this.service.state.context.events[0];
+    const metadata = this.getMetaData();
     const userInteractionEvents = [
-      firstEvent,
+      { timestamp: metadata.startTime },
       ...this.service.state.context.events.filter((ev) =>
         this.isUserInteraction(ev),
       ),
+      { timestamp: metadata.endTime },
     ];
     for (let i = 1; i < userInteractionEvents.length; i++) {
       const currentInterval = userInteractionEvents[i - 1];
       const _event = userInteractionEvents[i];
-      if (_event.timestamp! - currentInterval.timestamp! > SKIP_TIME_THRESHOLD) {
+      if (
+        _event.timestamp! - currentInterval.timestamp! >
+        SKIP_TIME_THRESHOLD
+      ) {
         allIntervals.push({
           startTime: currentInterval.timestamp!,
           endTime: _event.timestamp!,
@@ -292,13 +295,13 @@ export class Replayer {
         startTime: currentInterval.startTime,
         endTime: allIntervals[allIntervals.length - 1].endTime,
         duration:
-          allIntervals[allIntervals.length - 1].endTime - currentInterval.startTime,
+          allIntervals[allIntervals.length - 1].endTime -
+          currentInterval.startTime,
         active: allIntervals[allIntervals.length - 1].active,
       });
     }
     // Merges inactive segments that are less than a threshold into surrounding active sessions
     // TODO: Change this from a 3n pass to n
-    const metadata = this.getMetaData();
     currentInterval = mergedIntervals[0];
     for (let i = 1; i < mergedIntervals.length; i++) {
       if (
@@ -1447,7 +1450,7 @@ export class Replayer {
   }
 
   private backToNormal() {
-    this.nextUserInteractionEvent = null;
+    this.inactiveEndTimestamp = null;
     if (this.speedService.state.matches('normal')) {
       return;
     }