diff --git a/lib/handlers/post-order/handler.ts b/lib/handlers/post-order/handler.ts
index 2569c401..e8a0d015 100644
--- a/lib/handlers/post-order/handler.ts
+++ b/lib/handlers/post-order/handler.ts
@@ -105,7 +105,7 @@ export class PostOrderHandler extends APIGLambdaHandler<
       },
     })
     await this.kickoffOrderTrackingSfn(
-      { orderHash: id, chainId: chainId, orderStatus: ORDER_STATUS.UNVERIFIED, quoteId: quoteId ?? '' },
+      { orderHash: id, chainId: chainId, orderStatus: ORDER_STATUS.UNVERIFIED, quoteId: quoteId ?? `undefined-${id}` },
       stateMachineArn,
       log
     )
@@ -121,6 +121,7 @@ export class PostOrderHandler extends APIGLambdaHandler<
     const startExecutionCommand = new StartExecutionCommand({
       stateMachineArn: stateMachineArn,
       input: JSON.stringify(sfnInput),
+      name: sfnInput.quoteId,
     })
     log?.info(startExecutionCommand, 'Starting state machine execution')
     await sfnClient.send(startExecutionCommand)
diff --git a/test/handlers/post-order.test.ts b/test/handlers/post-order.test.ts
index 021dd2de..53c93120 100644
--- a/test/handlers/post-order.test.ts
+++ b/test/handlers/post-order.test.ts
@@ -220,6 +220,7 @@ describe('Testing post order handler.', () => {
         new StartExecutionCommand({
           stateMachineArn: MOCK_ARN,
           input: JSON.stringify(sfnInput),
+          name: sfnInput.quoteId,
         }).input
       )
     })