diff --git a/libs/langchain/langchain/vectorstores/matching_engine.py b/libs/langchain/langchain/vectorstores/matching_engine.py
index cf740d7568..c5f1286615 100644
--- a/libs/langchain/langchain/vectorstores/matching_engine.py
+++ b/libs/langchain/langchain/vectorstores/matching_engine.py
@@ -174,11 +174,19 @@ class MatchingEngine(VectorStore):
         logger.debug(f"Embedding query {query}.")
         embedding_query = self.embedding.embed_documents([query])
 
-        response = self.endpoint.match(
-            deployed_index_id=self._get_index_id(),
-            queries=embedding_query,
-            num_neighbors=k,
-        )
+        # If the endpoint is public we use the find_neighbors function.
+        if self.endpoint._public_match_client:
+            response = self.endpoint.find_neighbors(
+                deployed_index_id=self._get_index_id(),
+                queries=embedding_query,
+                num_neighbors=k,
+            )
+        else:
+            response = self.endpoint.match(
+                deployed_index_id=self._get_index_id(),
+                queries=embedding_query,
+                num_neighbors=k,
+            )
 
         if len(response) == 0:
             return []