diff --git a/src/vnsw/agent/oper/inet_unicast_route.cc b/src/vnsw/agent/oper/inet_unicast_route.cc
index c56eb78b1f9..7be5d67439f 100644
--- a/src/vnsw/agent/oper/inet_unicast_route.cc
+++ b/src/vnsw/agent/oper/inet_unicast_route.cc
@@ -117,8 +117,7 @@ static void Inet4UnicastTableEnqueue(Agent *agent, DBRequest *req) {
 
 static void Inet6UnicastTableEnqueue(Agent *agent, const string &vrf_name,
                                      DBRequest *req) {
-    AgentRouteTable *table =
-        agent->vrf_table()->GetInet6UnicastRouteTable(vrf_name);
+    AgentRouteTable *table = agent->fabric_inet4_unicast_table();
     if (table) {
         table->Enqueue(req);
     }
diff --git a/src/vnsw/agent/oper/path_preference.cc b/src/vnsw/agent/oper/path_preference.cc
index e0ef8215920..115dca9dcab 100644
--- a/src/vnsw/agent/oper/path_preference.cc
+++ b/src/vnsw/agent/oper/path_preference.cc
@@ -431,11 +431,11 @@ void PathPreferenceSM::EnqueuePathChange() {
 
     AgentRouteTable *table = NULL;
     if (rt_->GetTableType() == Agent::EVPN) {
-        table = rt_->vrf()->GetEvpnRouteTable();
+        table = agent_->fabric_evpn_table();
     } else if (rt_->GetTableType() == Agent::INET4_UNICAST) {
-        table = rt_->vrf()->GetInet4UnicastRouteTable();
+        table = agent_->fabric_inet4_unicast_table();
     } else if (rt_->GetTableType() == Agent::INET6_UNICAST) {
-        table = rt_->vrf()->GetInet6UnicastRouteTable();
+        table = agent_->fabric_inet4_unicast_table();
     }
 
     if (table) {