diff --git a/skyvern/forge/sdk/db/client.py b/skyvern/forge/sdk/db/client.py
index 8cbfe829..3f69e821 100644
--- a/skyvern/forge/sdk/db/client.py
+++ b/skyvern/forge/sdk/db/client.py
@@ -400,6 +400,7 @@ class AgentDB:
                         .filter_by(task_id=task_id)
                         .filter_by(organization_id=organization_id)
                         .order_by(StepModel.order.asc())
+                        .order_by(StepModel.retry_index.asc())
                     )
                 ).first():
                     return convert_to_step(step, debug_enabled=self.debug_enabled)