diff --git a/.changeset/empty-bees-suffer.md b/.changeset/empty-bees-suffer.md
deleted file mode 100644
index e3d87a51ad2..00000000000
--- a/.changeset/empty-bees-suffer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Revert tool progress for now
diff --git a/.changeset/sixty-ants-begin.md b/.changeset/sixty-ants-begin.md
deleted file mode 100644
index 5ef9e04868d..00000000000
--- a/.changeset/sixty-ants-begin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-v3.8.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7afcfae2d94..fd6a574dc6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Roo Code Changelog
 
+## [3.8.4] - 2025-03-09
+
+- Roll back multi-diff progress indicator temporarily to fix a double-confirmation in saving edits
+- Add an option in the prompts tab to save tokens by disabling the ability to ask Roo to create/edit custom modes for you (thanks @hannesrudolph!)
+
 ## [3.8.3] - 2025-03-09
 
 - Fix VS Code LM API model picker truncation issue
diff --git a/package-lock.json b/package-lock.json
index 6884f2e6269..cd961b0a210 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "roo-cline",
-	"version": "3.8.3",
+	"version": "3.8.4",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "roo-cline",
-			"version": "3.8.3",
+			"version": "3.8.4",
 			"dependencies": {
 				"@anthropic-ai/bedrock-sdk": "^0.10.2",
 				"@anthropic-ai/sdk": "^0.37.0",
diff --git a/package.json b/package.json
index e4adffd1d75..b32a81071db 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Roo Code (prev. Roo Cline)",
 	"description": "A whole dev team of AI agents in your editor.",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.8.3",
+	"version": "3.8.4",
 	"icon": "assets/icons/rocket.png",
 	"galleryBanner": {
 		"color": "#617A91",