diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
index f4f10bd2d..d55f5a30e 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
@@ -322,7 +322,9 @@ public class DebugActivity extends GBActivity {
                         @Override
                         protected Object doInBackground(Object[] params) {
                             helper.importOldDb(oldHandler, device, targetHandler);
-                            progress.dismiss();
+                            if (!isFinishing() && !isDestroyed()) {
+                                progress.dismiss();
+                            }
                             return null;
                         }
                     }.execute((Object[]) null);