diff --git a/CHANGELOG.md b/CHANGELOG.md
index 726b2ca78137ea0da0e51ae2e0a74f71a7a6eda4..8b2bb7c5bf1159b7794ef43c378e245e2629c5bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.17.1
+
+* Fix UI glitch when showing multiple reactions
+
 ### Version 2.17.0
 
 * Support Message Reactions
diff --git a/build.gradle b/build.gradle
index 1acf698171fc90db1c8c7837ff1d93bc44870856..7be25ad8a4d320517951b7d74aac5289ff3c7dbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,8 +100,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42121
-        versionName "2.17.0"
+        versionCode 42122
+        versionName "2.17.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212204.txt b/fastlane/metadata/android/en-US/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..976971e5a56d1ef863e19cd4789def4af4634dcb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Fix UI glitch when showing multiple reactions