diff --git a/project/src/modules/admin/api/notifications.routes.ts b/project/src/modules/admin/api/notifications.routes.ts
index 814e295..3ca2fb8 100644
--- a/project/src/modules/admin/api/notifications.routes.ts
+++ b/project/src/modules/admin/api/notifications.routes.ts
@@ -15,7 +15,7 @@ export function notificationsRoutes(fastify: FastifyInstance, pool: Pool) {
               AND updated_at < NOW() - INTERVAL '24 hours'
           ) AS shipped_24h,
           COUNT(*) FILTER (
-            WHERE payment_status = 'AWAITING'
+            WHERE state = 'AWAITING_PAYMENT'
               AND state = 'PENDING'
           ) AS awaiting_payment
         FROM pos_orders
diff --git a/project/src/modules/backoffice/api/backoffice.routes.ts b/project/src/modules/backoffice/api/backoffice.routes.ts
index f864191..47864fb 100644
--- a/project/src/modules/backoffice/api/backoffice.routes.ts
+++ b/project/src/modules/backoffice/api/backoffice.routes.ts
@@ -166,7 +166,7 @@ export async function registerBackofficeRoutes(
       SELECT
         COUNT(*) FILTER (WHERE state = 'PENDING') AS pending,
         COUNT(*) FILTER (WHERE state = 'SHIPPED' AND updated_at < NOW() - INTERVAL '24 hours') AS shipped_24h,
-        COUNT(*) FILTER (WHERE payment_status = 'AWAITING' AND state = 'PENDING') AS awaiting_payment
+        COUNT(*) FILTER (WHERE state = 'AWAITING_PAYMENT') AS awaiting_payment
       FROM pos_orders
       WHERE deleted_at IS NULL AND created_at > NOW() - INTERVAL '30 days'
     `);
diff --git a/project/src/modules/orders/api/orders.routes.ts b/project/src/modules/orders/api/orders.routes.ts
index 6ab948c..2168ff2 100644
--- a/project/src/modules/orders/api/orders.routes.ts
+++ b/project/src/modules/orders/api/orders.routes.ts
@@ -546,8 +546,7 @@ export async function registerOrdersRoutes(
               COUNT(*) OVER()::int AS total_count
        FROM orders_orders o
        LEFT JOIN identity_users u ON u.id = o.user_id
-       WHERE o.payment_status = 'AWAITING'
-         AND o.state = 'PENDING'
+       WHERE o.state = 'AWAITING_PAYMENT'
          AND o.deleted_at IS NULL
        ORDER BY o.created_at ASC
        LIMIT 20`,