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 0764b7d7ae..111acb6a51 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -1124,6 +1124,7 @@ private void actuallyPublish(boolean preview){
 			public void onSuccess(Status result){
 				if(preview){
 					openPreview(result);
+					uuid=null;
 					return;
 				}
 
@@ -1562,7 +1563,6 @@ private void buildContentTypePopup(View btn) {
 		}
 
 		contentTypePopup.setOnMenuItemClickListener(i->{
-			uuid=null;
 			int index=i.getItemId();
 			contentType=ContentType.values()[index];
 			btn.setSelected(index!=ContentType.UNSPECIFIED.ordinal() && index!=ContentType.PLAIN.ordinal());