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 be81240d1..7744796fa 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
@@ -397,9 +397,10 @@ public class DataManagementPlanManager {
 
     public void createOrUpdate(ApiContext apiContext, DataManagementPlanEditorModel dataManagementPlan, Principal principal) throws Exception {
 
-        DMP dmp1 = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(dataManagementPlan.getId());
-        if (dmp1.getStatus().equals(DMP.DMPStatus.FINALISED.getValue())) {
-            throw new Exception("DMP is finalized, therefore cannot be edited.");
+        if (dataManagementPlan.getStatus() == (int) DMP.DMPStatus.FINALISED.getValue() && dataManagementPlan.getId() != null) {
+            DMP dmp1 = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(dataManagementPlan.getId());
+            if (dmp1.getStatus().equals(DMP.DMPStatus.FINALISED.getValue()))
+                throw new Exception("DMP is finalized, therefore cannot be edited.");
         }
 
         DMP newDmp = dataManagementPlan.toDataModel();