diff --git a/lib/server/job_server.py b/lib/server/job_server.py
index 04303ec..319c6a0 100755
--- a/lib/server/job_server.py
+++ b/lib/server/job_server.py
@@ -269,7 +269,7 @@ def add_job_handler():
                 job['input_path'] = uploaded_file_local_path
                 output_dir = os.path.join(job_dir, job.get('name', None) or 'output')
                 os.makedirs(output_dir, exist_ok=True)
-                job['output_path'] = os.path.join(output_dir, os.path.basename(job.get('name', job['output_path'])))
+                job['output_path'] = os.path.join(output_dir, os.path.basename(job.get('name', None) or job['output_path']))
             remove_job_dir = len(jobs_list) == 1 and uploaded_file_local_path  # remove failed job dir for single file uploads only
             add_result = add_job(job, remove_job_dir_on_failure=remove_job_dir)
             results.append(add_result)