diff --git a/swh/deposit/api/common.py b/swh/deposit/api/common.py
--- a/swh/deposit/api/common.py
+++ b/swh/deposit/api/common.py
@@ -817,11 +817,8 @@
                 "code deposits, only one may be used on a given deposit.",
             )
 
-        self._deposit_put(
-            deposit=deposit, in_progress=headers.in_progress,
-        )
-
         if swhid is not None:
+            deposit.save()  # We need a deposit id
             swhid, swhid_ref, depo, depo_request = self._store_metadata_deposit(
                 deposit, swhid, metadata, raw_metadata
             )
@@ -841,6 +838,10 @@
                 archive=None,
             )
 
+        self._deposit_put(
+            deposit=deposit, in_progress=headers.in_progress,
+        )
+
         self._deposit_request_put(
             deposit,
             {METADATA_KEY: metadata, RAW_METADATA_KEY: raw_metadata},