diff --git a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
index 953436f3feee12504123160da5be4ccf03c2ea8b..0c95cc0f10d913f7efee600b53cb58422c40fe6f 100644
--- a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
+++ b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
@@ -218,8 +218,11 @@ class IngestJobManager:
 
         if job_status == JobRetry and retry_attempt != None:
             return os.path.join(base_dir, group_dir, str(retry_attempt))
+        elif job_status in [JobToDo, JobProduced, JobRemoved, JobFailed]:
+            group_dir = '%s_%s' % (job_type, job_group_id)
+            return os.path.join(base_dir, group_dir)
 
-        return os.path.join(base_dir, group_dir)
+        return base_dir
 
     def jobPath(self, job_admin_dict):
         dir = self.jobDir(job_admin_dict)