diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
index 5acf8ba81157a..2a4ee47b659cf 100644
--- a/bin/node-template/node/src/service.rs
+++ b/bin/node-template/node/src/service.rs
@@ -169,8 +169,8 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		transaction_pool,
 		other: (block_import, grandpa_link, mut telemetry),
 	} = new_partial(&config)?;
-	// TODO: add genesis hash.
-	let chain_prefix = format!("/{}", config.protocol_id().as_ref());
+	let genesis_hash = client.block_hash(0).ok().flatten().unwrap_or_default();
+	let chain_prefix = format!("/{}/{}", config.protocol_id().as_ref(), genesis_hash);
 
 	if let Some(url) = &config.keystore_remote {
 		match remote_keystore(url) {
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
index 7b3449a7cfb85..e945ecb868d03 100644
--- a/bin/node/cli/src/service.rs
+++ b/bin/node/cli/src/service.rs
@@ -326,8 +326,8 @@ pub fn new_full_base(
 
 	let shared_voter_state = rpc_setup;
 	let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht;
-	// TODO: add genesis hash.
-	let chain_prefix = format!("/{}", config.protocol_id().as_ref());
+	let genesis_hash = client.block_hash(0).ok().flatten().unwrap_or_default();
+	let chain_prefix = format!("/{}/{}", config.protocol_id().as_ref(), genesis_hash);
 
 	config.network.extra_sets.push(grandpa::grandpa_peers_set_config(&chain_prefix));
 	let warp_sync = Arc::new(grandpa::warp_proof::NetworkProvider::new(