diff --git a/internal/common/omci/get.go b/internal/common/omci/get.go
index dc40f53..e47dc0c 100644
--- a/internal/common/omci/get.go
+++ b/internal/common/omci/get.go
@@ -256,7 +256,8 @@
 
 	return &omci.GetResponse{
 		MeBasePacket: omci.MeBasePacket{
-			EntityClass: me.UniGClassID,
+			EntityClass:    me.UniGClassID,
+			EntityInstance: entityID,
 		},
 		Attributes:    managedEntity.GetAttributeValueMap(),
 		AttributeMask: attributeMask,
@@ -294,7 +295,8 @@
 
 	return &omci.GetResponse{
 		MeBasePacket: omci.MeBasePacket{
-			EntityClass: me.PhysicalPathTerminationPointEthernetUniClassID,
+			EntityClass:    me.PhysicalPathTerminationPointEthernetUniClassID,
+			EntityInstance: entityID,
 		},
 		Attributes:    managedEntity.GetAttributeValueMap(),
 		AttributeMask: attributeMask,