diff --git a/orchagent/dash/dashvnetorch.cpp b/orchagent/dash/dashvnetorch.cpp
index f163ee352ee..adc6e7e642c 100644
--- a/orchagent/dash/dashvnetorch.cpp
+++ b/orchagent/dash/dashvnetorch.cpp
@@ -438,7 +438,7 @@ void DashVnetOrch::addPaValidation(const string& key, VnetMapBulkContext& ctxt)
     string underlay_ip_str = to_string(ctxt.metadata.underlay_ip());
     string pa_ref_key = ctxt.vnet_name + ":" + underlay_ip_str;
 
-    auto vnet_underlay_ips = vnet_table_[ctxt.vnet_name].underlay_ips;
+    auto& vnet_underlay_ips = vnet_table_[ctxt.vnet_name].underlay_ips;
     std::string underlay_sip_str = to_string(ctxt.metadata.underlay_ip());
     if (vnet_underlay_ips.find(underlay_sip_str) != vnet_underlay_ips.end())
     {
diff --git a/orchagent/zmqorch.cpp b/orchagent/zmqorch.cpp
index 1a9b8995d27..d92321902c9 100644
--- a/orchagent/zmqorch.cpp
+++ b/orchagent/zmqorch.cpp
@@ -9,14 +9,11 @@ void ZmqConsumer::execute()
 {
     SWSS_LOG_ENTER();
 
-    size_t update_size = 0;
     auto table = static_cast<swss::ZmqConsumerStateTable*>(getSelectable());
-    do
-    {
-        std::deque<KeyOpFieldsValuesTuple> entries;
-        table->pops(entries);
-        update_size = addToSync(entries);
-    } while (update_size != 0);
+
+    std::deque<KeyOpFieldsValuesTuple> entries;
+    table->pops(entries);
+    addToSync(entries);
 
     drain();
 }