diff --git a/CHANGELOG.md b/CHANGELOG.md
index de6bb19956..8c53af59eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [1.12.17](https://github.com/element-hq/element-web/releases/tag/v1.12.17) (2026-04-30)
+==================================================================================================
+## 🐛 Bug Fixes
+
+* [Backport] Fix OIDC login callback handling on Element Desktop ([#33337](https://github.com/element-hq/element-web/pull/33337)). Contributed by @t3chguy.
+
+
 Changes in [1.12.16](https://github.com/element-hq/element-web/releases/tag/v1.12.16) (2026-04-28)
 ==================================================================================================
 ## 🦖 Deprecations
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 6717fda312..b9c2c021c1 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -3,7 +3,7 @@
     "productName": "Element",
     "main": "lib/electron-main.js",
     "exports": "./lib/electron-main.js",
-    "version": "1.12.16",
+    "version": "1.12.17",
     "description": "Element: the future of secure communication",
     "author": {
         "name": "Element",
diff --git a/apps/web/package.json b/apps/web/package.json
index a87a5e7fa8..357dc9e0ac 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.12.16",
+    "version": "1.12.17",
     "description": "Element: the future of secure communication",
     "author": "New Vector Ltd.",
     "repository": {