diff --git a/app/build.gradle b/app/build.gradle
index 4ab8912db..acc1514f9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 32
-        versionCode 439
-        versionName "3.9.4"
+        versionCode 440
+        versionName "3.9.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 3a01fdffd..91c767e86 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,4 +1,9 @@
 [
+  {
+    "version": "3.9.5",
+    "code": "440",
+    "note": "Fixed:\n- Custom emoji are not always displayed\n- Jumps in timeline when using \"fit preview images\"\n- Dark theme: timeline buttons without toggle"
+  },
   {
     "version": "3.9.4",
     "code": "439",
diff --git a/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java b/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java
index 39689d82d..f121afc18 100644
--- a/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java
+++ b/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java
@@ -125,7 +125,7 @@ public class CustomEmoji extends ReplacementSpan {
                 if (view != null) {
                     view.invalidate();
                 }
-                if (callback != null) {
+                if (callback != null && !callbackCalled) {
                     callbackCalled = true;
                     callback.emojiFetched();
                 }
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/440.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/440.txt
new file mode 100644
index 000000000..f896f5661
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/440.txt
@@ -0,0 +1,4 @@
+Fixed:
+- Custom emoji are not always displayed
+- Jumps in timeline when using "fit preview images"
+- Dark theme: timeline buttons without toggle
\ No newline at end of file