diff --git a/adaptercore/device_handler.go b/adaptercore/device_handler.go
index f077eef..3bb34db 100644
--- a/adaptercore/device_handler.go
+++ b/adaptercore/device_handler.go
@@ -130,6 +130,10 @@
 	}
 	// portNum := IntfIdToPortNo(intfId,portType)
 	portNum := intfId
+	if portType == voltha.Port_ETHERNET_NNI {
+		portNum = IntfIdToPortNo(intfId, portType)
+	}
+	// portNum := IntfIdToPortNo(intfId,portType)
 	label := GetportLabel(portNum, portType)
 	if len(label) == 0 {
 		log.Errorw("Invalid-port-label", log.Fields{"portNum": portNum, "portType": portType})