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 f7b73dd76..5d9381632 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
@@ -868,7 +868,9 @@ public class DataManagementPlanManager {
                     .thenApplyAsync(entityDataset -> {
                         Dataset newDataset = new Dataset();
                         try {
-                            this.datasetManager.updateTags(apiContext.getOperationsContext().getDatasetRepository(), new DatasetWizardModel().fromDataModel(entityDataset));
+                            DatasetWizardModel datasetWizardModel = new DatasetWizardModel().fromDataModel(entityDataset);
+                            datasetWizardModel.setTags(apiContext.getOperationsContext().getDatasetRepository().findDocument(dataset.getId().toString()).getTags());
+                            this.datasetManager.updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel);
                         } catch (IOException e) {
                             logger.error(e.getMessage(), e);
                         }
@@ -952,7 +954,9 @@ public class DataManagementPlanManager {
                     }
                     datasetElastic.setPublic(dataset1.getDmp().isPublic());
                     datasetElastic.setGrantStatus(dataset1.getDmp().getGrant().getStatus());
+
                     try {
+                        datasetElastic.setTags(apiContext.getOperationsContext().getDatasetRepository().findDocument(dataset.getId().toString()).getTags());
                         apiContext.getOperationsContext().getDatasetRepository().createOrUpdate(datasetElastic);
                     } catch (IOException e) {
                         logger.error(e.getMessage(), e);