diff --git a/lib/galaxy/web/controllers/root.py b/lib/galaxy/web/controllers/root.py
index b262836f18e..2b8d7868f2a 100644
--- a/lib/galaxy/web/controllers/root.py
+++ b/lib/galaxy/web/controllers/root.py
@@ -281,11 +281,10 @@ class RootController( BaseController ):
             if data.parent_id is None and len( data.creating_job_associations ) > 0:
                 # Mark associated job for deletion
                 job = data.creating_job_associations[0].job
-                if job.state not in [ model.Job.states.QUEUED, model.Job.states.RUNNING, model.Job.states.NEW ]:
-                    return
-                # Are *all* of the job's other output datasets deleted?
-                if job.check_if_output_datasets_deleted():
-                    job.mark_deleted()                
+                if job.state in [ model.Job.states.QUEUED, model.Job.states.RUNNING, model.Job.states.NEW ]:
+                    # Are *all* of the job's other output datasets deleted?
+                    if job.check_if_output_datasets_deleted():
+                        job.mark_deleted()                
             self.app.model.flush()
 
     @web.expose