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 21bc3aa6d..8025e9dde 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -211,6 +211,13 @@ public class ComposeFragment extends ToolbarFragment implements OnBackPressedLis
 		}
 	}
 
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		if(uploadingAttachment!=null && uploadingAttachment.uploadRequest!=null)
+			uploadingAttachment.uploadRequest.cancel();
+	}
+
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);