diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java
index 203988549d..79189b3f01 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java
@@ -36,7 +36,7 @@ public abstract class ProgressDialogAsyncTask<Params, Progress, Result> extends
   @CallSuper
   @Override
   protected void onPostExecute(Result result) {
-    if (progress != null) progress.dismiss();
+    if (progress != null && progress.isShowing()) progress.dismiss();
   }
 
   protected Context getContext() {