diff --git a/src/replay/index.ts b/src/replay/index.ts
index d613bb3032..e9b4a623a5 100644
--- a/src/replay/index.ts
+++ b/src/replay/index.ts
@@ -158,7 +158,7 @@ export class Replayer {
       event.data.positions = event.data.positions.map(p => {
         return {
           ...p,
-          timeOffset: p.timeOffset - firstOffset,
+          timeOffset: p.timeOffset - firstOffset + firstTimestamp - this.baselineTime,
         };
       });
       return firstTimestamp - this.baselineTime;
diff --git a/src/replay/timer.ts b/src/replay/timer.ts
index 316e61d461..d6db248bae 100644
--- a/src/replay/timer.ts
+++ b/src/replay/timer.ts
@@ -30,16 +30,13 @@ export default class Timer {
     const start = performance.now();
     const { actions, config } = this;
     function check(time: number) {
-      if (actions.length === 0) {
-        return;
-      }
       delayed = time - start;
       while (actions.length) {
         const action = actions[0];
         const delayNeeded = action.delay / config.speed;
         if (delayed >= delayNeeded) {
-          action.doAction();
           actions.shift();
+          action.doAction();
         } else {
           break;
         }