diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9757a60..561e354 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -534,6 +534,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Duration display rounding bug**: `formatDuration` in the frontend Processing Logs page now
   uses `Math.floor` instead of `Math.round` for the seconds component, eliminating the "60s"
   artefact that appeared for durations very close to a whole minute boundary.
+- **Frontend dependency conflict**: Bumped `react` from `19.2.4` to `19.2.5` in `frontend/package.json` to match `react-dom@19.2.5`, resolving the `ERESOLVE` peer-dependency conflict that broke `npm ci`.
 
 ### Changed
 - **Decoupled Gmail permissions from Google Sign-In**: The "Sign in with Google" OAuth flow now only requests basic profile scopes (`openid`, `email`, `profile`) instead of also requesting Gmail API scopes (`gmail.insert`, `gmail.labels`, `gmail.readonly`). Users can grant Gmail access separately via the "Connect Gmail" button in Settings. This results in a simpler, permission-free login experience.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 83149ab..617574a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -12,7 +12,7 @@
         "axios": "^1.15.0",
         "lucide-react": "^1.8.0",
         "next": "16.2.3",
-        "react": "19.2.4",
+        "react": "19.2.5",
         "react-dom": "19.2.5",
         "zustand": "^5.0.12"
       },
@@ -8908,9 +8908,9 @@
       "license": "MIT"
     },
     "node_modules/react": {
-      "version": "19.2.4",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
-      "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
+      "version": "19.2.5",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.5.tgz",
+      "integrity": "sha512-llUJLzz1zTUBrskt2pwZgLq59AemifIftw4aB7JxOqf1HY2FDaGDxgwpAPVzHU1kdWabH7FauP4i1oEeer2WCA==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
diff --git a/frontend/package.json b/frontend/package.json
index 49459b4..492d7c0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -15,7 +15,7 @@
     "axios": "^1.15.0",
     "lucide-react": "^1.8.0",
     "next": "16.2.3",
-    "react": "19.2.4",
+    "react": "19.2.5",
     "react-dom": "19.2.5",
     "zustand": "^5.0.12"
   },