diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 328c2cdba..2a9060acb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -496,14 +496,14 @@ public class DataManagementPlanManager {
         createFunderIfItDoesntExist(tempDMP, apiContext.getOperationsContext().getDatabaseRepository().getFunderDao());
         createGrantIfItDoesntExist(tempDMP, apiContext.getOperationsContext().getDatabaseRepository().getGrantDao());
 
+        DMP result = createOrUpdate(dataManagementPlan, principal);
+
         for (DatasetWizardModel datasetWizardModel: dataManagementPlan.getDatasets()) {
-            datasetWizardModel.setDmp(new DataManagementPlan().fromDataModel(tempDMP));
+            datasetWizardModel.setDmp(new DataManagementPlan().fromDataModel(result));
             Dataset dataset = datasetManager.createOrUpdate(datasetWizardModel, principal);
             datasets.add(dataset);
         }
 
-        DMP result = createOrUpdate(dataManagementPlan, principal);
-
         return result;
     }