diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
index 106652337..ccf68688f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
@@ -190,6 +190,8 @@ public class DatasetWizardModel implements DataModel<Dataset, DatasetWizardModel
         entity.setReference(this.reference);
         entity.setUri(this.uri);
         entity.setStatus(this.status);
+        if (this.status == (int) Dataset.Status.FINALISED.getValue())
+            entity.setFinalizedAt(new Date());
         DMP dmp = new DMP();
         dmp.setId(this.dmp.getId());
         entity.setDmp(dmp);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
index fec1fed3b..05587428c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
@@ -271,6 +271,9 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
         }
 
         dataManagementPlanEntity.setStatus((short) this.status);
+        if (this.status == (int) DMP.DMPStatus.FINALISED.getValue()) {
+            dataManagementPlanEntity.setFinalizedAt(new Date());
+        }
         dataManagementPlanEntity.setDescription(this.description);
         if (this.profiles != null) {
             Set<DatasetProfile> datasetProfiles = new HashSet<>();