diff --git a/node/src/chain_spec/g1.rs b/node/src/chain_spec/g1.rs
index 5cfc42125baa4f372b29b20664a41800cd9f7030..78f879a8c8e75c9c6775634e93b75560c2477c9e 100644
--- a/node/src/chain_spec/g1.rs
+++ b/node/src/chain_spec/g1.rs
@@ -200,7 +200,9 @@ fn genesis_data_to_g1_genesis_conf(
                         value: common_runtime::IdtyValue {
                             data: IdtyData {
                                 first_eligible_ud: match status {
-                                    common_runtime::IdtyStatus::Member => 1_u16.into(),
+                                    // Only members are eligible to UD.
+                                    // The first claimable UD has the minimum index (1).
+                                    common_runtime::IdtyStatus::Member => g1_runtime::pallet_universal_dividend::FirstEligibleUd::min(),
                                     _ => g1_runtime::pallet_universal_dividend::FirstEligibleUd(None),
                                 }
                             },
diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs
index 36c906c112d37518cc67924f84c507fd75486dd5..d6ff6806f28d596fb4ef9ce6755dbbc0749668af 100644
--- a/node/src/chain_spec/gdev.rs
+++ b/node/src/chain_spec/gdev.rs
@@ -288,7 +288,9 @@ fn genesis_data_to_gdev_genesis_conf(
                         value: common_runtime::IdtyValue {
                             data: IdtyData {
                                 first_eligible_ud: match status {
-                                    common_runtime::IdtyStatus::Member => 1_u16.into(),
+                                    // Only members are eligible to UD.
+                                    // The first claimable UD has the minimum index (1).
+                                    common_runtime::IdtyStatus::Member => gdev_runtime::pallet_universal_dividend::FirstEligibleUd::min(),
                                     _ => gdev_runtime::pallet_universal_dividend::FirstEligibleUd(None),
                                 }
                             },
diff --git a/node/src/chain_spec/gtest.rs b/node/src/chain_spec/gtest.rs
index 80a5705fbd6eb7bcf95b6f3696413dc7085a86d5..b80ad714fd552c675bc9bebe9ef9cd0316b07a41 100644
--- a/node/src/chain_spec/gtest.rs
+++ b/node/src/chain_spec/gtest.rs
@@ -293,7 +293,9 @@ fn genesis_data_to_gtest_genesis_conf(
                         value: common_runtime::IdtyValue {
                             data: IdtyData {
                                 first_eligible_ud: match status {
-                                    common_runtime::IdtyStatus::Member => 1_u16.into(),
+                                    // Only members are eligible to UD.
+                                    // The first claimable UD has the minimum index (1).
+                                    common_runtime::IdtyStatus::Member => gtest_runtime::pallet_universal_dividend::FirstEligibleUd::min(),
                                     _ => gtest_runtime::pallet_universal_dividend::FirstEligibleUd(None),
                                 }
                             },
diff --git a/runtime/gdev/tests/common/mod.rs b/runtime/gdev/tests/common/mod.rs
index 192857d112bdc5647cb958bcdfa82062b2d3651c..82b5ade8d586dfb587c83b5ebd850b5d6b303500 100644
--- a/runtime/gdev/tests/common/mod.rs
+++ b/runtime/gdev/tests/common/mod.rs
@@ -224,7 +224,7 @@ impl ExtBuilder {
                     name: name.clone(),
                     value: IdtyValue {
                         data: IdtyData {
-                            first_eligible_ud: 1_u16.into(),
+                            first_eligible_ud: pallet_universal_dividend::FirstEligibleUd::min(),
                         },
                         next_creatable_identity_on: Default::default(),
                         owner_key: owner_key.clone(),