diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel1.java b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel1.java
index 897492d1b9..db264255f8 100644
--- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel1.java
+++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel1.java
@@ -200,7 +200,7 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
                 Logger logger = Logger.getLogger(AddImageWizardPanel1.class.getName());
                 logger.log(Level.WARNING, "Error cleaning up image task", ex);
             }finally{
-                settings.putProperty(AddImageAction.IMAGECLEANUPTASK_PROP, null);
+                cleanupTask.disable();
             }
         }
         
diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel3.java b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel3.java
index b9cefe071b..67ec1ecd00 100644
--- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel3.java
+++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel3.java
@@ -171,8 +171,6 @@ class AddImageWizardPanel3 implements WizardDescriptor.Panel<WizardDescriptor> {
      */
     @Override
     public void storeSettings(WizardDescriptor settings) {
-        // Cancel all cleanup tasks
-        settings.putProperty(AddImageAction.IMAGECLEANUPTASK_PROP, null);
     }