diff --git a/src/app/runs/[runId]/components/Editor.tsx b/src/app/runs/[runId]/components/Editor.tsx
index 4394595..f4114be 100644
--- a/src/app/runs/[runId]/components/Editor.tsx
+++ b/src/app/runs/[runId]/components/Editor.tsx
@@ -9,7 +9,7 @@ import { json } from "@codemirror/lang-json";
 import { python } from "@codemirror/lang-python";
 import { java } from "@codemirror/lang-java";
 import { useEffect, useState } from "react";
-import useAction, { useActionOnce } from "@/hook/use-action";
+import useAction from "@/hook/use-action";
 import { getLiveRunMoves } from "@/modules/live-run/actions";
 import { LiveRun, LiveRunMove } from "@/modules/live-run/types";
 
@@ -43,13 +43,31 @@ function getLanguageExtension(lang: Language) {
 
 export default function Editor({ run }: { run: LiveRun | null | undefined }) {
   const [editorView, setEditorView] = useState<EditorView>();
-  const [moves] = useAction<LiveRunMove[]>(
+  const [rawMoves] = useAction<LiveRunMove[]>(
     async () => (run ? await getLiveRunMoves(run.id) : []),
     [run],
   );
 
+  const [lastMoveId, setLastMoveId] = useState<number>(-1);
+  const [moves, setMoves] = useState<LiveRunMove[]>([]);
+
   useEffect(() => {
-    console.log(moves);
+    let moves = rawMoves?.filter((move) => move.moveId > lastMoveId) || [];
+
+    if (moves.length === 0) return;
+
+    setMoves(moves);
+    setLastMoveId(lastMoveId + moves.length);
+
+    if (rawMoves?.length || 0 > 0) {
+      console.log("raw", rawMoves);
+    }
+  }, [rawMoves]);
+
+  useEffect(() => {
+    if (moves.length > 0) {
+      console.log("moves", moves);
+    }
   }, [moves]);
 
   useEffect(() => {
@@ -63,7 +81,7 @@ export default function Editor({ run }: { run: LiveRun | null | undefined }) {
           if (!editorView || cancelled) return resolve();
 
           editorView.dispatch({
-            selection: { anchor: move.cursor },
+            // selection: { anchor: move.cursor },
             scrollIntoView: true,
             changes: move.changes,
           });
@@ -86,7 +104,7 @@ export default function Editor({ run }: { run: LiveRun | null | undefined }) {
     return () => {
       cancelled = true;
     };
-  }, [editorView, moves]);
+  }, [moves]);
 
   return (
     <CodeMirror
diff --git a/src/modules/live-run/core.ts b/src/modules/live-run/core.ts
index 7958b82..845215a 100644
--- a/src/modules/live-run/core.ts
+++ b/src/modules/live-run/core.ts
@@ -4,6 +4,7 @@ import "server-only";
 import { LiveRun, LiveRunMove } from "./types";
 import { SupabaseClient } from "@supabase/supabase-js";
 import { redis } from "@/lib/redis";
+import { randomInt } from "crypto";
 
 /** -------------------- Live Runs in Redis -------------------- */
 
@@ -55,13 +56,12 @@ export async function addLiveRunMoves(id: string, moves: LiveRunMove[]) {
   const pipeline = redis.pipeline();
   moves.forEach((move) => {
     pipeline.rpush(`liveRunMoves:${id}`, JSON.stringify(move));
-    setTimeout(() => {
-      redis.del(`liveRunMoves:${id}`);
-    }, 3000);
   });
 
-  // Optional: keep moves ephemeral automatically after 3s
-  pipeline.expire(`liveRunMoves:${id}`, 3);
+  setTimeout(() => {
+    redis.del(`liveRunMoves:${id}`);
+  }, 3000);
+
   await pipeline.exec();
 }
 
diff --git a/src/modules/live-run/types.ts b/src/modules/live-run/types.ts
index 9673d12..99d98e8 100644
--- a/src/modules/live-run/types.ts
+++ b/src/modules/live-run/types.ts
@@ -11,6 +11,7 @@ export interface LiveRun {
 export interface LiveRunMove {
   latency: number;
   cursor: number;
+  moveId: number;
   changes?: {
     from: number;
     to: number;