diff --git a/internal/pkg/core/device_handler.go b/internal/pkg/core/device_handler.go
index 05e85ff..b5ca83b 100755
--- a/internal/pkg/core/device_handler.go
+++ b/internal/pkg/core/device_handler.go
@@ -1579,7 +1579,7 @@
 
 		onuDevice, err := dh.getChildDeviceFromCore(ctx, &ca.ChildDeviceFilter{
 			ParentId:     dh.device.Id,
-			OnuId:        omciInd.OnuId,
+			OnuId:        &omciInd.OnuId,
 			ParentPortNo: ponPort,
 		})
 		if err != nil {
@@ -2146,7 +2146,7 @@
 		onuDevice, err = dh.getChildDeviceFromCore(ctx, &ca.ChildDeviceFilter{
 			ParentId:     dh.device.Id,
 			SerialNumber: serialNumber,
-			OnuId:        onuInd.OnuId,
+			OnuId:        &onuInd.OnuId,
 			ParentPortNo: ponPort,
 		})
 	}
@@ -2263,7 +2263,7 @@
 
 	onuDevice, err := dh.getChildDeviceFromCore(ctx, &ca.ChildDeviceFilter{
 		ParentId:     dh.device.Id,
-		OnuId:        onuID,
+		OnuId:        &onuID,
 		ParentPortNo: parentPort,
 	})