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 5ae417d25..328c2cdba 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
@@ -209,14 +209,19 @@ public class DataManagementPlanManager {
         }
         dataManagementPlan.fromDataModel(dataManagementPlanEntity);
         List<Dataset> datasetEnities = new ArrayList<>(dataManagementPlanEntity.getDataset());
-        for (int i = 0; i < datasetEnities.size(); i++) {
+        /*for (int i = 0; i < datasetEnities.size(); i++) {
             for (int j = i; j < dataManagementPlan.getDatasets().size(); j++) {
                 if (dataManagementPlan.getDatasets().get(j).getId().equals(datasetEnities.get(i).getId())) {
                     dataManagementPlan.getDatasets().get(j).setDatasetProfileDefinition(datasetManager.getPagedProfile(dataManagementPlan.getDatasets().get(j), datasetEnities.get(i)));
                     break;
                 }
             }
-        }
+        }*/
+        datasetEnities.stream()
+                      .filter(dataset -> !dataset.getStatus().equals(Dataset.Status.DELETED) && !dataset.getStatus().equals(Dataset.Status.CANCELED))
+                      .forEach(dataset -> {
+                          dataManagementPlan.getDatasets().stream().filter(datasetWizardModel -> datasetWizardModel.getId().equals(dataset.getId())).forEach(datasetWizardModel -> datasetWizardModel.setDatasetProfileDefinition(datasetManager.getPagedProfile(datasetWizardModel, dataset)));
+                      });
         if (isPublic) {
             dataManagementPlan.setDatasets(dataManagementPlan.getDatasets().stream().filter(dataset -> dataset.getStatus() == Dataset.Status.FINALISED.getValue()).collect(Collectors.toList()));
         }