1 files changed, 2 insertions, 1 deletions
diff --git a/src/vpp-api/python/vpp_papi/vpp_papi_async.py b/src/vpp-api/python/vpp_papi/vpp_papi_async.py
index d9a4fabb69e..44e2a78eeea 100644
--- a/src/vpp-api/python/vpp_papi/vpp_papi_async.py
+++ b/src/vpp-api/python/vpp_papi/vpp_papi_async.py
@@ -451,7 +451,8 @@ class VPPApiClient:
         for m in r.message_table:
             n = m.name
             self.message_table[n] = m.index
-        self.vpp_dictionary_maxid = len(self.message_table)
+        # Find the maximum index of the message table
+        self.vpp_dictionary_maxid = max(self.message_table.values() or [0])
 
         # self.worker_task = asyncio.create_task(self.message_handler(event_queue))
         requests = {}