diff --git a/agent/agent.py b/agent/agent.py
index 9ade5773c5b..99eb13e5272 100644
--- a/agent/agent.py
+++ b/agent/agent.py
@@ -505,7 +505,7 @@ def do_mkdir():
     try:
         mode = int(request.form.get("mode", 0o777))
 
-        os.makedirs(request.form["dirpath"], mode=mode)
+        os.makedirs(request.form["dirpath"], mode=mode, exist_ok=True)
     except Exception as ex:
         print(f"error creating dir {ex}")
         return json_exception("Error creating directory")
diff --git a/web/apiv2/views.py b/web/apiv2/views.py
index 253db68005c..c82e3bfc1e7 100644
--- a/web/apiv2/views.py
+++ b/web/apiv2/views.py
@@ -1092,7 +1092,7 @@ def tasks_status(request, task_id):
                 complete_folder = hashlib.md5(f"cape-{task_id}".encode()).hexdigest()
                 # ToDo proper OS version join
                 dest_folder = f"{guest_env['environ']['TMP']}\\{complete_folder}"
-                r = requests.post(f"http://{machine.ip}:8000/mkdir", data={"dirpath": dest_folder})
+                r = requests.post(f"http://{machine.ip}:8000/mkdir", data={"dirpath": dest_folder}, exist_ok=True)
                 resp = {"error": r.status_code == 200, "data": r.text}
             except requests.exceptions.ConnectionError as e:
                 log.error(e)