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 b52a44429..308d10a5d 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
@@ -457,7 +457,7 @@ public class DataManagementPlanManager {
 
         if (newDmp.getGrant().getId() != null) {
             Grant grant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(newDmp.getGrant().getId());
-            if (grant.getFunder() != null
+            if (grant.getFunder() != null && newDmp.getGrant().getFunder() != null
                     && !grant.getFunder().getId().equals(newDmp.getGrant().getFunder().getId())
                     && !grant.getCreationUser().getId().equals(user.getId())){
                 throw new Exception("User is not the owner of the Grant, therefore, cannot edit it");
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 a0d73dc83..545fb1954 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
@@ -309,6 +309,9 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
                 dataManagementPlanEntity.getGrant().setFunder(funder);
             }
         }
+        else {
+            dataManagementPlanEntity.getGrant().setFunder(null);
+        }
 
         if (this.project != null) {
             if (this.project.getExistProject() != null && this.project.getLabel() == null && this.project.getDescription() == null)