diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85a42d0dd0..0c72e0737b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,13 @@
 # Roo Code Changelog
 
-## 3.36.3
+## [3.36.4] - 2025-12-10
 
-### Patch Changes
+![3.36.4 Release - Error Details Modal](/releases/3.36.4-release.png)
 
-- ![3.36.4 Release - Error Details Modal](/releases/3.36.4-release.png)
+- Add error details modal with on-demand display for improved error visibility when debugging issues (PR #9985 by @roomote)
+- Fix: Prevent premature rawChunkTracker clearing for MCP tools, improving reliability of MCP tool streaming (PR #9993 by @daniel-lxs)
+- Fix: Filter out 429 rate limit errors from API error telemetry for cleaner metrics (PR #9987 by @daniel-lxs)
+- Fix: Correct TODO list display order in chat view to show items in proper sequence (PR #9991 by @roomote)
 
 ## [3.36.3] - 2025-12-09