diff --git a/framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java b/framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java
index 867ced5dbff..68123c93db6 100755
--- a/framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java
+++ b/framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java
@@ -5,6 +5,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.DecodeUtil;
+import org.tron.common.utils.Sha256Hash;
 import org.tron.common.utils.StringUtil;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.capsule.BlockCapsule;
@@ -156,17 +157,17 @@ public Protocol.HelloMessage getInstance() {
 
   public boolean valid() {
     byte[] genesisBlockByte = this.helloMessage.getGenesisBlockId().getHash().toByteArray();
-    if (genesisBlockByte.length == 0) {
+    if (genesisBlockByte.length != Sha256Hash.LENGTH) {
       return false;
     }
 
     byte[] solidBlockId = this.helloMessage.getSolidBlockId().getHash().toByteArray();
-    if (solidBlockId.length == 0) {
+    if (solidBlockId.length != Sha256Hash.LENGTH) {
       return false;
     }
 
     byte[] headBlockId = this.helloMessage.getHeadBlockId().getHash().toByteArray();
-    if (headBlockId.length == 0) {
+    if (headBlockId.length != Sha256Hash.LENGTH) {
       return false;
     }
 
diff --git a/framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java b/framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java
index 6cd117c83dd..7d4f40e1277 100644
--- a/framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java
+++ b/framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java
@@ -127,7 +127,7 @@ private void sendHelloMessage(PeerConnection peer, long time) {
         TronNetService.getP2pConfig().getIp(),
         TronNetService.getP2pConfig().getIpv6(),
         TronNetService.getP2pConfig().getPort());
-    HelloMessage message = new HelloMessage(node, time, ChainBaseManager.getChainBaseManager());
+    HelloMessage message = new HelloMessage(node, time, chainBaseManager);
     relayService.fillHelloMessage(message, peer.getChannel());
     peer.sendMessage(message);
     peer.setHelloMessageSend(message);
diff --git a/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java b/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java
index f4fabce5d64..ca7f980429f 100644
--- a/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java
+++ b/framework/src/test/java/org/tron/core/net/services/HandShakeServiceTest.java
@@ -123,7 +123,7 @@ public void testInvalidHelloMessage() {
     Protocol.HelloMessage.Builder builder =
         getHelloMessageBuilder(node, System.currentTimeMillis(),
             ChainBaseManager.getChainBaseManager());
-    //block hash is empty
+    //block hash length is not valid
     try {
       BlockCapsule.BlockId hid = ChainBaseManager.getChainBaseManager().getHeadBlockId();
       Protocol.HelloMessage.BlockId hBlockId = Protocol.HelloMessage.BlockId.newBuilder()
@@ -132,7 +132,15 @@ public void testInvalidHelloMessage() {
           .build();
       builder.setHeadBlockId(hBlockId);
       HelloMessage helloMessage = new HelloMessage(builder.build().toByteArray());
-      Assert.assertTrue(!helloMessage.valid());
+      Assert.assertFalse(helloMessage.valid());
+
+      hBlockId = Protocol.HelloMessage.BlockId.newBuilder()
+          .setHash(ByteString.copyFrom(new byte[1]))
+          .setNumber(hid.getNum())
+          .build();
+      builder.setHeadBlockId(hBlockId);
+      helloMessage = new HelloMessage(builder.build().toByteArray());
+      Assert.assertFalse(helloMessage.valid());
     } catch (Exception e) {
       Assert.fail();
     }