diff --git a/.changeset/dull-flowers-trade.md b/.changeset/dull-flowers-trade.md
deleted file mode 100644
index 7cbe6d9f8ed..00000000000
--- a/.changeset/dull-flowers-trade.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Fix auto-approvals
diff --git a/.changeset/tiny-mugs-give.md b/.changeset/tiny-mugs-give.md
deleted file mode 100644
index 7aff925bac3..00000000000
--- a/.changeset/tiny-mugs-give.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Improve Gemini caching efficiency
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2b44282d69..97c7dbafc1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Roo Code Changelog
 
+## [3.15.4] - 2025-05-04
+
+- Fix a nasty bug that would cause Roo Code to hang, particularly in orchestrator mode
+- Improve Gemini caching efficiency
+
 ## [3.15.3] - 2025-05-02
 
 - Terminal: Fix empty command bug
diff --git a/package-lock.json b/package-lock.json
index 1f6ad6dc9a7..ca5891871de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "roo-cline",
-	"version": "3.15.3",
+	"version": "3.15.4",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "roo-cline",
-			"version": "3.15.3",
+			"version": "3.15.4",
 			"dependencies": {
 				"@anthropic-ai/bedrock-sdk": "^0.10.2",
 				"@anthropic-ai/sdk": "^0.37.0",
diff --git a/package.json b/package.json
index 4c3c8f11d6e..b73e3610eaf 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.15.3",
+	"version": "3.15.4",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",