diff --git a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
index f1455d2a7..b5048d0ef 100644
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -34,10 +34,8 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-
       sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number),
       sortOrder: sortcolumn === "ro_number" && sortorder,
-
       render: (text, record) => (
         <Link to={"/manage/jobs/" + record.id}>
           {record.ro_number || t("general.labels.na")}
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index a583b7808..b18673de6 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -12,7 +12,7 @@ export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
       offset: $offset
       limit: $limit
       where: { status: { _in: $statuses }, converted: { _eq: $isConverted } }
-      order_by: { created_at: desc }
+      order_by: $order
     ) {
       iouparent
       ownr_fn
diff --git a/client/src/pages/jobs-all/jobs-all.container.jsx b/client/src/pages/jobs-all/jobs-all.container.jsx
index a678ecab9..dd78369a0 100644
--- a/client/src/pages/jobs-all/jobs-all.container.jsx
+++ b/client/src/pages/jobs-all/jobs-all.container.jsx
@@ -40,9 +40,9 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
           {
             [sortcolumn || "ro_number"]:
               sortorder && sortorder !== "false"
-                ? sortorder === "descend"
+                ? (sortorder === "descend"
                   ? "desc"
-                  : "asc"
+                  : "asc")
                 : "desc",
           },
         ],