diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index e420bbc073fa94dff0c7bc4416cc8fa9d387524c..ca40ed92276a0d09ff1e111bc3cf710adc3f521e 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -626,7 +626,6 @@
       <name>db</name>
       <alias>Data_alias</alias>
       <isPageable v="false" />
-      <hasDependentRecords v="true" />
       <conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
diff --git a/entity/KeywordEntry_entity/entityfields/ab_keyword_entryid/valueProcess.js b/entity/KeywordEntry_entity/entityfields/ab_keyword_entryid/valueProcess.js
index 4af99287f59a86e98d9b4c552c010fe13c106cc7..e0c496f09541a007c74f8acb385b21ae51fb44a6 100644
--- a/entity/KeywordEntry_entity/entityfields/ab_keyword_entryid/valueProcess.js
+++ b/entity/KeywordEntry_entity/entityfields/ab_keyword_entryid/valueProcess.js
@@ -3,5 +3,5 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
     result.string(util.getNewUUID());
\ No newline at end of file