diff --git a/src/backend/langflow/graph/graph/base.py b/src/backend/langflow/graph/graph/base.py
index fd635ddcf..6097ea10f 100644
--- a/src/backend/langflow/graph/graph/base.py
+++ b/src/backend/langflow/graph/graph/base.py
@@ -70,7 +70,7 @@ class Graph:
     def _build_graph(self) -> None:
         """Builds the graph from the vertices and edges."""
         self.vertices = self._build_vertices()
-        self.vertex_ids = [vertex.id for vertex in self.vertices]
+        self.vertex_map = {vertex.id: vertex for vertex in self.vertices}
         self.edges = self._build_edges()
 
         # This is a hack to make sure that the LLM vertex is sent to
@@ -107,7 +107,7 @@ class Graph:
 
     def get_vertex(self, vertex_id: str) -> Union[None, Vertex]:
         """Returns a vertex by id."""
-        return next((vertex for vertex in self.vertices if vertex.id == vertex_id), None)
+        return self.vertex_map.get(vertex_id)
 
     def get_vertex_edges(self, vertex_id: str) -> List[Edge]:
         """Returns a list of edges for a given vertex."""
@@ -249,3 +249,4 @@ class Graph:
         vertex_ids = [vertex.id for vertex in self.vertices]
         edges_repr = "\n".join([f"{edge.source_id} --> {edge.target_id}" for edge in self.edges])
         return f"Graph:\nNodes: {vertex_ids}\nConnections:\n{edges_repr}"
+        return f"Graph:\nNodes: {vertex_ids}\nConnections:\n{edges_repr}"
diff --git a/tests/test_graph.py b/tests/test_graph.py
index 020642798..9a69e33b5 100644
--- a/tests/test_graph.py
+++ b/tests/test_graph.py
@@ -81,8 +81,8 @@ def test_graph_structure(basic_graph):
         assert isinstance(node, Vertex)
     for edge in basic_graph.edges:
         assert isinstance(edge, Edge)
-        assert edge.source_id in basic_graph.vertex_ids
-        assert edge.target_id in basic_graph.vertex_ids
+        assert edge.source_id in basic_graph.vertex_map.keys()
+        assert edge.target_id in basic_graph.vertex_map.keys()
 
 
 def test_circular_dependencies(basic_graph):