diff --git a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/NodeDescriptors.java b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/NodeDescriptors.java
index f91ac26..a07368b 100644
--- a/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/NodeDescriptors.java
+++ b/protocols/bgp/bgpio/src/main/java/org/onosproject/bgpio/protocol/linkstate/NodeDescriptors.java
@@ -182,9 +182,13 @@
                 break;
             case IGP_ROUTERID_TYPE:
                 if (protocolId == IS_IS_LEVEL_1_PROTOCOL_ID || protocolId == IS_IS_LEVEL_2_PROTOCOL_ID) {
-                    if (length == ISISNONPSEUDONODE_LEN) {
+                    boolean isNonPseudoNode = true;
+                    if ((length == ISISPSEUDONODE_LEN) && (tempCb.getByte(ISISPSEUDONODE_LEN - 1) != 0)) {
+                        isNonPseudoNode = false;
+                    }
+                    if (isNonPseudoNode) {
                         tlv = IsIsNonPseudonode.read(tempCb);
-                    } else if (length == ISISPSEUDONODE_LEN) {
+                    } else {
                         tlv = IsIsPseudonode.read(tempCb);
                     }
                 } else if (protocolId == OSPF_V2_PROTOCOL_ID || protocolId == OSPF_V3_PROTOCOL_ID) {