1 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java
index cf9c72f5c..6d9c24d59 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java
@@ -195,8 +195,11 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
         if (timer != null) {
             timer.cancel();
         }
-        unregisterReceiver(imageReceiver);
-
+        try {
+            unregisterReceiver(imageReceiver);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        }
     }