diff --git a/openeo/extra/job_management/__init__.py b/openeo/extra/job_management/__init__.py
index 47a976e53..861a4cc89 100644
--- a/openeo/extra/job_management/__init__.py
+++ b/openeo/extra/job_management/__init__.py
@@ -630,13 +630,14 @@ def on_job_done(self, job: BatchJob, row):
         # TODO: param `row` is never accessed in this method. Remove it? Is this intended for future use?
 
         job_metadata = job.describe()
+        job_dir = self.get_job_dir(job.job_id)
+        self.ensure_job_dir_exists(job.job_id)
         metadata_path = self.get_job_metadata_path(job.job_id)
-        with metadata_path.open("w", encoding="utf-8") as f:
-            json.dump(job_metadata, f, ensure_ascii=False)
 
         if self._download:
-            job_dir = self.get_job_dir(job.job_id)
-            self.ensure_job_dir_exists(job.job_id)
+            with metadata_path.open("w", encoding="utf-8") as f:
+                json.dump(job_metadata, f, ensure_ascii=False)
+
             job.get_results().download_files(target=job_dir)