diff --git a/server/src/queries/workflow.repository.sql b/server/src/queries/workflow.repository.sql
index 86c26f5360..f44ba54066 100644
--- a/server/src/queries/workflow.repository.sql
+++ b/server/src/queries/workflow.repository.sql
@@ -25,6 +25,8 @@ select
           inner join "plugin" on "plugin"."id" = "plugin_method"."pluginId"
         where
           "workflow"."id" = "workflow_step"."workflowId"
+        order by
+          "workflow_step"."order" asc
       ) as agg
   ) as "steps"
 from
@@ -57,6 +59,8 @@ select
           inner join "plugin" on "plugin"."id" = "plugin_method"."pluginId"
         where
           "workflow"."id" = "workflow_step"."workflowId"
+        order by
+          "workflow_step"."order" asc
       ) as agg
   ) as "steps"
 from
diff --git a/server/src/repositories/workflow.repository.ts b/server/src/repositories/workflow.repository.ts
index 7a39e78ce9..9c946fe583 100644
--- a/server/src/repositories/workflow.repository.ts
+++ b/server/src/repositories/workflow.repository.ts
@@ -39,7 +39,8 @@ export class WorkflowRepository {
               'plugin_method.name as methodName',
               'workflow_step.config',
               'workflow_step.enabled',
-            ]),
+            ])
+            .orderBy('workflow_step.order', 'asc'),
         ).as('steps'),
       ]);
   }