diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 902a95a6f6..c3821d22a7 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -14,7 +14,7 @@ android {
 		minSdk 23
 		targetSdk 33
 		versionCode 104
-		versionName "2.5.2"
+		versionName "2.5.3"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
index 68a9c89032..765941d469 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
@@ -144,6 +144,7 @@ public void onError(ErrorResponse error){
 
 	@Override
 	public void onDestroy(){
+		removeBackCallback(exitQueryModeCallback);
 		super.onDestroy();
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java
index 38ed1c5345..b1ea112820 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java
@@ -100,6 +100,8 @@ private void loadAutocompleteServers(){
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(List<CatalogInstance> result){
+						if(getActivity()==null)
+							return;
 						data.clear();
 						data.addAll(sortInstances(result));
 						updateFilteredList();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/EditFilterFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/EditFilterFragment.java
index 83f1f43f44..3f3e4ada19 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/EditFilterFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/EditFilterFragment.java
@@ -97,6 +97,12 @@ public void onCreate(Bundle savedInstanceState){
 		setRetainInstance(true);
 	}
 
+	@Override
+	public void onDestroy(){
+		removeBackCallback(confirmCallback);
+		super.onDestroy();
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){}