diff --git a/.eslintignore b/.eslintignore
index 298aa7585765f..29d959598349e 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1,5 @@
 .eslintrc.js
 jest.config.ts
+node_modules
+rust
+livestream
diff --git a/.eslintrc.js b/.eslintrc.js
index fa36af54fc983..f1af109bde41a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,7 +12,7 @@ const globals = {
 }
 
 module.exports = {
-    ignorePatterns: ['node_modules', 'plugin-server'],
+    ignorePatterns: ['node_modules', 'plugin-server', 'rust', 'livestream'],
     env,
     settings: {
         react: {
diff --git a/.gitignore b/.gitignore
index a41dd0980a217..362ec30bce107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ pyrightconfig.json
 .temporal-worker-settings
 temp_test_run_data.json
 .temp-deepeval-cache.json
+.eslintcache
\ No newline at end of file
diff --git a/frontend/src/scenes/session-recordings/player/PlayerUpNext.tsx b/frontend/src/scenes/session-recordings/player/PlayerUpNext.tsx
index b16df4b1722eb..8e79230261cf8 100644
--- a/frontend/src/scenes/session-recordings/player/PlayerUpNext.tsx
+++ b/frontend/src/scenes/session-recordings/player/PlayerUpNext.tsx
@@ -50,9 +50,13 @@ export function PlayerUpNext({ playlistLogic }: PlayerUpNextProps): JSX.Element
         if (endReached && nextSessionRecording?.id) {
             setAnimate(true)
             setPlayNextAnimationInterrupted(false)
-            timeoutRef.current = setTimeout(() => {
-                goToRecording(true)
-            }, 30000) // NOTE: Keep in sync with SCSS
+            timeoutRef.current = setTimeout(
+                () => {
+                    goToRecording(true)
+                },
+                // NOTE: Keep in sync with SCSS
+                3000
+            )
         }
 
         return () => clearTimeout(timeoutRef.current)
diff --git a/package.json b/package.json
index 4da2f9aff7c1a..d2447587dbae9 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
         "prettier": "prettier --write \"./**/*.{js,mjs,ts,tsx,json,yaml,yml,css,scss}\"",
         "prettier:check": "prettier --check \"frontend/**/*.{js,mjs,ts,tsx,json,yaml,yml,css,scss}\"",
         "typescript:check": "tsc --noEmit && echo \"No errors reported by tsc.\"",
-        "lint:js": "eslint frontend/src cypress",
+        "lint:js": "eslint --cache frontend/src cypress",
         "lint:css": "stylelint \"frontend/**/*.{css,scss}\"",
         "format:backend": "ruff .",
         "format:frontend": "pnpm lint:js --fix && pnpm lint:css --fix && pnpm prettier",
@@ -349,7 +349,7 @@
             "prettier --write"
         ],
         "frontend/src/**/*.{js,jsx,mjs,ts,tsx}": [
-            "eslint -c .eslintrc.js --fix",
+            "eslint --cache -c .eslintrc.js --fix",
             "prettier --write"
         ],
         "frontend/*.mjs": [