diff --git a/src/services/main/paymentManager.ts b/src/services/main/paymentManager.ts
index 50bb01e0..c07c8ef3 100644
--- a/src/services/main/paymentManager.ts
+++ b/src/services/main/paymentManager.ts
@@ -459,7 +459,7 @@ export default class {
             throw new Error("request a swap quote before payng an external address")
         }
         const app = await this.storage.applicationStorage.GetApplication(ctx.app_id)
-        const txSwap = await this.storage.paymentStorage.GetTransactionSwap(req.swap_operation_id)
+        const txSwap = await this.storage.paymentStorage.GetTransactionSwap(req.swap_operation_id, ctx.app_user_id)
         if (!txSwap) {
             throw new Error("swap quote not found")
         }
diff --git a/src/services/storage/paymentStorage.ts b/src/services/storage/paymentStorage.ts
index 357ee7aa..6f35fbb7 100644
--- a/src/services/storage/paymentStorage.ts
+++ b/src/services/storage/paymentStorage.ts
@@ -466,8 +466,8 @@ export default class {
         return this.dbs.CreateAndSave<TransactionSwap>('TransactionSwap', swap)
     }
 
-    async GetTransactionSwap(swapOperationId: string, txId?: string) {
-        return this.dbs.FindOne<TransactionSwap>('TransactionSwap', { where: { swap_operation_id: swapOperationId, used: false } }, txId)
+    async GetTransactionSwap(swapOperationId: string, appUserId: string, txId?: string) {
+        return this.dbs.FindOne<TransactionSwap>('TransactionSwap', { where: { swap_operation_id: swapOperationId, used: false, app_user_id: appUserId } }, txId)
     }
 
     async FinalizeTransactionSwap(swapOperationId: string, txId: string) {