diff --git a/internal/pkg/core/openolt_flowmgr.go b/internal/pkg/core/openolt_flowmgr.go
index eb35925..3cc00c7 100644
--- a/internal/pkg/core/openolt_flowmgr.go
+++ b/internal/pkg/core/openolt_flowmgr.go
@@ -2136,7 +2136,10 @@
 //RemoveFlow removes the flow from the device
 func (f *OpenOltFlowMgr) RemoveFlow(ctx context.Context, flow *ofp.OfpFlowStats) error {
 
-	logger.Infow(ctx, "removing-flow", log.Fields{"flow": *flow})
+	logger.Infow(ctx, "removing-flow", log.Fields{
+		"flow":      *flow,
+		"device-id": f.deviceHandler.device.Id,
+	})
 	var direction string
 	actionInfo := make(map[string]interface{})
 
@@ -2249,7 +2252,9 @@
 	logger.Infow(ctx, "adding-flow",
 		log.Fields{
 			"flow":         flow,
-			"flowmetadata": flowMetadata})
+			"flowmetadata": flowMetadata,
+			"device-id":    f.deviceHandler.device.Id,
+		})
 	formulateClassifierInfoFromFlow(ctx, classifierInfo, flow)
 
 	err := formulateActionInfoFromFlow(ctx, actionInfo, classifierInfo, flow)