diff --git a/src/lib/elements/contrib/invenioRDM/records/AffiliationsSuggestions.js b/src/lib/elements/contrib/invenioRDM/records/AffiliationsSuggestions.js
index cf9f604d..28a2d1a2 100644
--- a/src/lib/elements/contrib/invenioRDM/records/AffiliationsSuggestions.js
+++ b/src/lib/elements/contrib/invenioRDM/records/AffiliationsSuggestions.js
@@ -90,7 +90,7 @@ export const AffiliationsSuggestions = (creatibutors, isOrganization) => {
 
     return {
       text: creatibutor.name,
-      value: creatibutor.name,
+      value: creatibutor.id || creatibutor.name,
       name: creatibutor.name,
       extra: creatibutor,
       id: creatibutor.id,