diff --git a/src/vnsw/agent/vrouter/ksync/flowtable_ksync.cc b/src/vnsw/agent/vrouter/ksync/flowtable_ksync.cc
index 9c98fb07447..270a0daa981 100644
--- a/src/vnsw/agent/vrouter/ksync/flowtable_ksync.cc
+++ b/src/vnsw/agent/vrouter/ksync/flowtable_ksync.cc
@@ -329,13 +329,14 @@ int FlowTableKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) {
                 }
             }
 
-            //TODO Seperate flags for BgpRouterService??
-            if (nat_flow->is_flags_set(FlowEntry::LinkLocalBindLocalSrcPort) ||
-                nat_flow->is_flags_set(FlowEntry::BgpRouterService)) {
+            //Link local, flag determines relaxed policy
+            if (nat_flow->is_flags_set(FlowEntry::LinkLocalBindLocalSrcPort)) {
                 flags |= VR_FLOW_FLAG_LINK_LOCAL;
-                if (nat_flow->is_flags_set(FlowEntry::BgpRouterService)) {
-                    flags |= VR_FLOW_BGP_SERVICE;
-                }
+            }
+
+            //Bgp service, flag determines relaxed policy
+            if (nat_flow->is_flags_set(FlowEntry::BgpRouterService)) {
+                flags |= VR_FLOW_BGP_SERVICE;
             }
 
             flags |= VR_FLOW_FLAG_VRFT;