diff --git a/internal/pkg/mib/mib_sync.go b/internal/pkg/mib/mib_sync.go
index a1cc82c..595228e 100755
--- a/internal/pkg/mib/mib_sync.go
+++ b/internal/pkg/mib/mib_sync.go
@@ -643,6 +643,7 @@
 	}
 }
 
+// nolint: gocyclo
 func (oo *OnuDeviceEntry) handleOmciGetResponseMessage(ctx context.Context, msg cmn.OmciMessage) error {
 	var err error = nil
 
@@ -729,14 +730,20 @@
 				return nil
 			case "IpHostConfigData":
 				oo.mutexLastTxParamStruct.RUnlock()
-				macBytes, _ := me.InterfaceToOctets(meAttributes[me.IpHostConfigData_MacAddress])
+				ipHostConfigMacAddress, ok := meAttributes[me.IpHostConfigData_MacAddress]
 				oo.MutexPersOnuConfig.Lock()
-				if cmn.OmciMacAddressLen == len(macBytes) {
-					oo.SOnuPersistentData.PersMacAddress = hex.EncodeToString(macBytes[:])
-					logger.Debugw(ctx, "MibSync FSM - GetResponse Data for IpHostConfigData - MacAddress", log.Fields{"device-id": oo.deviceID,
-						"macAddress": oo.SOnuPersistentData.PersMacAddress})
+				if ok {
+					macBytes, _ := me.InterfaceToOctets(ipHostConfigMacAddress)
+					if cmn.OmciMacAddressLen == len(macBytes) {
+						oo.SOnuPersistentData.PersMacAddress = hex.EncodeToString(macBytes[:])
+						logger.Debugw(ctx, "MibSync FSM - GetResponse Data for IpHostConfigData - MacAddress", log.Fields{"device-id": oo.deviceID,
+							"macAddress": oo.SOnuPersistentData.PersMacAddress})
+					} else {
+						logger.Infow(ctx, "MibSync FSM - MacAddress wrong length - fill macAddress with zeros", log.Fields{"device-id": oo.deviceID, "length": len(macBytes)})
+						oo.SOnuPersistentData.PersMacAddress = cEmptyMacAddrString
+					}
 				} else {
-					logger.Infow(ctx, "MibSync FSM - MacAddress wrong length - fill macAddress with zeros", log.Fields{"device-id": oo.deviceID, "length": len(macBytes)})
+					logger.Infow(ctx, "MibSync FSM - MacAddress field not present in ip host config - fill macAddress with zeros", log.Fields{"device-id": oo.deviceID})
 					oo.SOnuPersistentData.PersMacAddress = cEmptyMacAddrString
 				}
 				oo.MutexPersOnuConfig.Unlock()