diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 8fc25ecc..0328eaae 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -13,7 +13,7 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 99
+		versionCode 100
 		versionName "2.5.0"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index c8d5960c..43382848 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -173,7 +173,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements ComposeE
 	private ForegroundColorSpan overLimitFG;
 
 	private Runnable emojiKeyboardHider;
-	private Runnable sendingBackButtonBlocker;
+	private Runnable sendingBackButtonBlocker=()->{};
 	private Runnable discardConfirmationCallback=this::confirmDiscardDraftAndFinish;
 	private boolean prevHadDraft;
 
@@ -750,6 +750,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements ComposeE
 				wm.removeView(sendingOverlay);
 				sendingOverlay=null;
 				removeBackCallback(sendingBackButtonBlocker);
+				removeBackCallback(discardConfirmationCallback);
 				if(editingStatus==null){
 					E.post(new StatusCreatedEvent(result, accountID));
 					if(replyTo!=null){