diff --git a/internal/pkg/controller/addflows.go b/internal/pkg/controller/addflows.go
index 2f13dbd..b7d42cd 100644
--- a/internal/pkg/controller/addflows.go
+++ b/internal/pkg/controller/addflows.go
@@ -95,6 +95,7 @@
 					if dbFlow.State == of.FlowAddSuccess {
 						aft.device.triggerFlowNotification(ctx, flow.Cookie, aft.flow.Command, of.BwAvailDetails{}, nil, true)
 						flowsPresent++
+						continue
 					}
 				}
 			}
@@ -114,6 +115,7 @@
 
 	if flowsPresent == len(aft.flow.SubFlows) {
 		logger.Warn(ctx, "All Flows already present in database. Skipping Flow Push to SB")
+		return nil
 	}
 
 	// PortName and PortID are used for validation of PortID, whether it is still valid and associated with old PortName or