diff --git a/server/public/model/version.go b/server/public/model/version.go
index bdd384e0d70..2961dd2138c 100644
--- a/server/public/model/version.go
+++ b/server/public/model/version.go
@@ -13,6 +13,7 @@ import (
 // It should be maintained in chronological order with most current
 // release at the front of the list.
 var versions = []string{
+	"11.8.4",
 	"11.8.3",
 	"11.8.2",
 	"11.8.1",
diff --git a/webapp/channels/package.json b/webapp/channels/package.json
index 8e91fef0c74..a8bd57262ca 100644
--- a/webapp/channels/package.json
+++ b/webapp/channels/package.json
@@ -3,7 +3,7 @@
   "browser": {
     "./client/web_client.jsx": "./client/browser_web_client.jsx"
   },
-  "version": "11.8.3",
+  "version": "11.8.4",
   "private": true,
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop": "1.7.7",
@@ -13,10 +13,10 @@
     "@giphy/js-fetch-api": "5.7.0",
     "@giphy/react-components": "10.1.0",
     "@guyplusplus/turndown-plugin-gfm": "1.0.7",
-    "@mattermost/client": "11.8.3",
+    "@mattermost/client": "11.8.4",
     "@mattermost/desktop-api": "6.2.0-1",
-    "@mattermost/shared": "11.8.3",
-    "@mattermost/types": "11.8.3",
+    "@mattermost/shared": "11.8.4",
+    "@mattermost/types": "11.8.4",
     "@mui/base": "5.0.0-alpha.127",
     "@mui/material": "5.11.16",
     "@mui/styled-engine-sc": "5.11.11",
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 8c57b889fce..2b40fed84cb 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -57,7 +57,7 @@
     },
     "channels": {
       "name": "mattermost-webapp",
-      "version": "11.8.3",
+      "version": "11.8.4",
       "dependencies": {
         "@atlaskit/pragmatic-drag-and-drop": "1.7.7",
         "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
@@ -66,10 +66,10 @@
         "@giphy/js-fetch-api": "5.7.0",
         "@giphy/react-components": "10.1.0",
         "@guyplusplus/turndown-plugin-gfm": "1.0.7",
-        "@mattermost/client": "11.8.3",
+        "@mattermost/client": "11.8.4",
         "@mattermost/desktop-api": "6.2.0-1",
-        "@mattermost/shared": "11.8.3",
-        "@mattermost/types": "11.8.3",
+        "@mattermost/shared": "11.8.4",
+        "@mattermost/types": "11.8.4",
         "@mui/base": "5.0.0-alpha.127",
         "@mui/material": "5.11.16",
         "@mui/styled-engine-sc": "5.11.11",
@@ -25646,7 +25646,7 @@
     },
     "platform/client": {
       "name": "@mattermost/client",
-      "version": "11.8.3",
+      "version": "11.8.4",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "30.0.0",
@@ -25657,7 +25657,7 @@
         "typescript": "^5.0.0"
       },
       "peerDependencies": {
-        "@mattermost/types": "11.8.3",
+        "@mattermost/types": "11.8.4",
         "typescript": "^4.3.0 || ^5.0.0"
       },
       "peerDependenciesMeta": {
@@ -25668,7 +25668,7 @@
     },
     "platform/components": {
       "name": "@mattermost/components",
-      "version": "11.8.3",
+      "version": "11.8.4",
       "dependencies": {
         "@tippyjs/react": "4.2.6",
         "react-bootstrap": "github:mattermost/react-bootstrap#05559f4c61c5a314783c390d2d82906ee8c7e558",
@@ -25700,7 +25700,7 @@
       "peerDependencies": {
         "@babel/runtime-corejs3": "^7.17.8",
         "@mattermost/compass-icons": "0.1.53",
-        "@mattermost/shared": "11.8.3",
+        "@mattermost/shared": "11.8.4",
         "classnames": "^2.3.1",
         "lodash": "^4.17.21",
         "react-intl": "*",
@@ -25851,11 +25851,11 @@
       }
     },
     "platform/mattermost-redux": {
-      "version": "11.8.3",
+      "version": "11.8.4",
       "license": "MIT",
       "dependencies": {
-        "@mattermost/client": "11.8.3",
-        "@mattermost/types": "11.8.3",
+        "@mattermost/client": "11.8.4",
+        "@mattermost/types": "11.8.4",
         "@redux-devtools/extension": "3.3.0",
         "lodash": "^4.17.21",
         "moment-timezone": "^0.5.38",
@@ -25877,7 +25877,7 @@
     },
     "platform/shared": {
       "name": "@mattermost/shared",
-      "version": "11.8.3",
+      "version": "11.8.4",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/react": "^0.26.6",
@@ -25911,7 +25911,7 @@
         "typescript": "^5.0.0"
       },
       "peerDependencies": {
-        "@mattermost/types": "11.8.3",
+        "@mattermost/types": "11.8.4",
         "@testing-library/react": "^16",
         "react": ">=17",
         "react-intl": ">=7",
@@ -26045,7 +26045,7 @@
     },
     "platform/types": {
       "name": "@mattermost/types",
-      "version": "11.8.3",
+      "version": "11.8.4",
       "license": "MIT",
       "devDependencies": {
         "typescript": "^5.0.0"
diff --git a/webapp/platform/client/package.json b/webapp/platform/client/package.json
index 448affa841c..bd9b4d5906c 100644
--- a/webapp/platform/client/package.json
+++ b/webapp/platform/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mattermost/client",
-  "version": "11.8.3",
+  "version": "11.8.4",
   "description": "JavaScript/TypeScript client for Mattermost",
   "keywords": [
     "mattermost"
@@ -27,7 +27,7 @@
     "typescript": "^5.0.0"
   },
   "peerDependencies": {
-    "@mattermost/types": "11.8.3",
+    "@mattermost/types": "11.8.4",
     "typescript": "^4.3.0 || ^5.0.0"
   },
   "peerDependenciesMeta": {
diff --git a/webapp/platform/components/package.json b/webapp/platform/components/package.json
index da678cd1c43..abe7c17d4c3 100644
--- a/webapp/platform/components/package.json
+++ b/webapp/platform/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mattermost/components",
-  "version": "11.8.3",
+  "version": "11.8.4",
   "private": true,
   "module": "dist/index.esm.js",
   "types": "dist/index.d.ts",
@@ -41,7 +41,7 @@
   "peerDependencies": {
     "@babel/runtime-corejs3": "^7.17.8",
     "@mattermost/compass-icons": "0.1.53",
-    "@mattermost/shared": "11.8.3",
+    "@mattermost/shared": "11.8.4",
     "classnames": "^2.3.1",
     "lodash": "^4.17.21",
     "react-intl": "*",
diff --git a/webapp/platform/mattermost-redux/package.json b/webapp/platform/mattermost-redux/package.json
index d0f28106d46..3a43eba5c0c 100644
--- a/webapp/platform/mattermost-redux/package.json
+++ b/webapp/platform/mattermost-redux/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mattermost-redux",
-  "version": "11.8.3",
+  "version": "11.8.4",
   "description": "Common code (API client, Redux stores, logic, utility functions) for building a Mattermost client",
   "keywords": [
     "mattermost"
@@ -39,8 +39,8 @@
     "directory": "webapp/platform/mattermost-redux"
   },
   "dependencies": {
-    "@mattermost/client": "11.8.3",
-    "@mattermost/types": "11.8.3",
+    "@mattermost/client": "11.8.4",
+    "@mattermost/types": "11.8.4",
     "@redux-devtools/extension": "3.3.0",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.38",
diff --git a/webapp/platform/shared/package.json b/webapp/platform/shared/package.json
index 11f8a38db9a..5b48d0f8c12 100644
--- a/webapp/platform/shared/package.json
+++ b/webapp/platform/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mattermost/shared",
-  "version": "11.8.3",
+  "version": "11.8.4",
   "description": "Shared components and utilities for use by the Mattermost web app and its plugins",
   "keywords": [
     "mattermost"
@@ -83,7 +83,7 @@
     "typescript": "^5.0.0"
   },
   "peerDependencies": {
-    "@mattermost/types": "11.8.3",
+    "@mattermost/types": "11.8.4",
     "@testing-library/react": "^16",
     "react": ">=17",
     "react-intl": ">=7",
diff --git a/webapp/platform/types/package.json b/webapp/platform/types/package.json
index 3d6ca427f86..d82020c18f3 100644
--- a/webapp/platform/types/package.json
+++ b/webapp/platform/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mattermost/types",
-  "version": "11.8.3",
+  "version": "11.8.4",
   "description": "Shared type definitions used by the Mattermost web app",
   "keywords": [
     "mattermost"