diff --git a/.env.local.test b/.env.local.test
index 4a10b919..264ed68e 100644
--- a/.env.local.test
+++ b/.env.local.test
@@ -27,4 +27,5 @@ VUE_APP_LBC_ADDRESS='0xc2A630c053D12D63d32b025082f6Ba268db18300'
 VUE_APP_DEBUG_MODE='true'
 
 NODE_ENV=test
+VUE_APP_FLYOVER_PEGOUT_QUOTE_DIFF_PERCENTAGE=2 # 2%
 
diff --git a/.github/workflows/deploy_MainNet_UI.yml b/.github/workflows/deploy_MainNet_UI.yml
index 4192a65a..409a73db 100644
--- a/.github/workflows/deploy_MainNet_UI.yml
+++ b/.github/workflows/deploy_MainNet_UI.yml
@@ -53,6 +53,7 @@ jobs:
           VUE_APP_AVERAGE_MINING_BLOCK=3
           VUE_APP_SLOW_MINING_BLOCK=5
           VUE_APP_LBC_ADDRESS='0xAA9cAf1e3967600578727F975F283446A3Da6612'
+          VUE_APP_FLYOVER_PEGOUT_QUOTE_DIFF_PERCENTAGE=2
           npm run-script build
 
       - name: Configure AWS credentials
diff --git a/.github/workflows/deploy_TestNet_UI.yml b/.github/workflows/deploy_TestNet_UI.yml
index 9b11a2c3..7edf5ed3 100644
--- a/.github/workflows/deploy_TestNet_UI.yml
+++ b/.github/workflows/deploy_TestNet_UI.yml
@@ -53,6 +53,7 @@ jobs:
           VUE_APP_AVERAGE_MINING_BLOCK=3
           VUE_APP_SLOW_MINING_BLOCK=5
           VUE_APP_LBC_ADDRESS='0xc2A630c053D12D63d32b025082f6Ba268db18300'
+          VUE_APP_FLYOVER_PEGOUT_QUOTE_DIFF_PERCENTAGE=2
           npm run-script build
 
       - name: Configure AWS credentials
diff --git a/.github/workflows/deploy_staging_MainNet_UI.yml b/.github/workflows/deploy_staging_MainNet_UI.yml
index 5643da4f..46f98081 100644
--- a/.github/workflows/deploy_staging_MainNet_UI.yml
+++ b/.github/workflows/deploy_staging_MainNet_UI.yml
@@ -53,6 +53,7 @@ jobs:
           VUE_APP_AVERAGE_MINING_BLOCK=3
           VUE_APP_SLOW_MINING_BLOCK=5
           VUE_APP_LBC_ADDRESS='0xAA9cAf1e3967600578727F975F283446A3Da6612'
+          VUE_APP_FLYOVER_PEGOUT_QUOTE_DIFF_PERCENTAGE=2
           npm run-script build
 
       - name: Configure AWS credentials
diff --git a/.github/workflows/deploy_staging_TestNet_UI.yml b/.github/workflows/deploy_staging_TestNet_UI.yml
index adbc7b31..739dc635 100644
--- a/.github/workflows/deploy_staging_TestNet_UI.yml
+++ b/.github/workflows/deploy_staging_TestNet_UI.yml
@@ -53,6 +53,7 @@ jobs:
           VUE_APP_AVERAGE_MINING_BLOCK=3
           VUE_APP_SLOW_MINING_BLOCK=5
           VUE_APP_LBC_ADDRESS='0xc2A630c053D12D63d32b025082f6Ba268db18300'
+          VUE_APP_FLYOVER_PEGOUT_QUOTE_DIFF_PERCENTAGE=2
           npm run-script build
 
       - name: Configure AWS credentials
diff --git a/ENV_VARIABLES.md b/ENV_VARIABLES.md
index e17ee9a8..66c4d41d 100644
--- a/ENV_VARIABLES.md
+++ b/ENV_VARIABLES.md
@@ -21,6 +21,7 @@ The value of these variables are used in **environment-variables.ts** file.
 |VUE_APP_MIN_FEE_SAT_PER_BYTE_SLOW   | `1`                                          | Min fee rate (sats/byte) required to broadcast the transaction                                            |
 |VUE_APP_LBC_ADDRESS   | `0xc2A630c053D12D63d32b025082f6Ba268db18300` | Liquidity bridge contract address on the flyover protocol                                                 |
 |VUE_APP_DEBUG_MODE   | `false`                                      | enable developer messages for debuging                                                                    |
+|VUE_APP_FLYOVER_PEGOUT_QUOTE_DIFF_PERCENTAGE   | `2`                                      | Defines quote difference percentage to 2% so it requieres the user to review condition only for a difference bigger that this percentage                                                                   |
 
 ## Example for .env.local.test file
 
@@ -42,4 +43,5 @@ VUE_APP_MIN_FEE_SAT_PER_BYTE_AVG=4
 VUE_APP_MIN_FEE_SAT_PER_BYTE_SLOW=1
 VUE_APP_LBC_ADDRESS='0xc2A630c053D12D63d32b025082f6Ba268db18300'
 VUE_APP_DEBUG_MODE='false'
+VUE_APP_FLYOVER_PEGOUT_QUOTE_DIFF_PERCENTAGE=2
 ```
diff --git a/src/common/store/constants.ts b/src/common/store/constants.ts
index bf824c09..04677608 100644
--- a/src/common/store/constants.ts
+++ b/src/common/store/constants.ts
@@ -159,8 +159,7 @@ export const FLYOVER_PEGOUT_SET_CLEAR_STATE = 'FLYOVER_PEGOUT_SET_CLEAR_STATE';
 export const FLYOVER_PEGOUT_SET_BTC_ADDRESS = 'FLYOVER_PEGOUT_SET_BTC_ADDRESS';
 export const FLYOVER_PEGOUT_SET_TX_HASH = 'FLYOVER_PEGOUT_SET_TX_HASH';
 export const FLYOVER_PEGOUT_SET_SELECTED_QUOTE = 'FLYOVER_PEGOUT_SET_SELECTED_QUOTE';
-export const FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCES = 'FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCES';
-export const FLYOVER_PEGOUT_SET_RESPONDING = 'FLYOVER_PEGOUT_SET_RESPONDING';
+export const FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCE = 'FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCE';
 
 // Flyover PegIn mutations
 export const FLYOVER_PEGIN_SET_PROVIDERS = 'FLYOVER_PEGIN_SET_PROVIDERS';
diff --git a/src/common/types/Flyover/FlyoverPegout.ts b/src/common/types/Flyover/FlyoverPegout.ts
index ca46a21e..9b2e8db0 100644
--- a/src/common/types/Flyover/FlyoverPegout.ts
+++ b/src/common/types/Flyover/FlyoverPegout.ts
@@ -1,10 +1,10 @@
-import { LiquidityProvider2WP, ObjectDifference, QuotePegOut2WP } from '@/common/types';
+import { LiquidityProvider2WP, QuotePegOut2WP } from '@/common/types';
 import { FlyoverService } from '../../services';
 import SatoshiBig from '../SatoshiBig';
 import WeiBig from '../WeiBig';
 
 export interface FlyoverPegoutState {
-    differences: Array<ObjectDifference>;
+    difference: number;
     amountToTransfer: WeiBig;
     validAmount: boolean;
     btcRecipientAddress: string;
@@ -14,5 +14,4 @@ export interface FlyoverPegoutState {
     flyoverService: FlyoverService;
     txHash?: string;
     selectedQuoteHash: string;
-    isResponding: boolean;
 }
diff --git a/src/common/types/environment-variables.ts b/src/common/types/environment-variables.ts
index 3e21ffbc..a8ddd673 100644
--- a/src/common/types/environment-variables.ts
+++ b/src/common/types/environment-variables.ts
@@ -45,6 +45,8 @@ export class EnvironmentVariables {
 
   public peginMinAmountAllowedInBtc: number;
 
+  public flyoverPegoutDiffPercentage: number;
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   constructor(defaultValues: any = {}) {
     this.vueAppCoin = process.env.VUE_APP_COIN || defaultValues.vueAppCoin;
@@ -87,5 +89,7 @@ export class EnvironmentVariables {
     this.debugMode = process.env.VUE_APP_DEBUG_MODE === 'true' || defaultValues.debugMode;
     this.peginMinAmountAllowedInBtc = Number(process.env.VUE_APP_PEGIN_MIN_AMOUNT_ALLOWED_IN_BTC)
       || defaultValues.peginMinValue;
+    this.flyoverPegoutDiffPercentage = Number(process.env
+      .VUE_APP_FLYOVER_PEGOUT_QUOTE_DIFF_PERCENTAGE) || defaultValues.flyoverPegoutDiffPercentage;
   }
 }
diff --git a/src/common/utils/common.ts b/src/common/utils/common.ts
index 8f7e5dd6..d22a9172 100644
--- a/src/common/utils/common.ts
+++ b/src/common/utils/common.ts
@@ -107,8 +107,7 @@ export const getClearFlyoverPegoutState = (): FlyoverPegoutState => ({
   quotes: {},
   flyoverService: markRaw(new FlyoverService()),
   selectedQuoteHash: '',
-  differences: [],
-  isResponding: false,
+  difference: 0,
 });
 
 export const getClearFlyoverPeginState = (): FlyoverPeginState => ({
diff --git a/src/main.ts b/src/main.ts
index 35f48aaa..9bc24a93 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -30,6 +30,7 @@ const defaultEnvironmentVariables = {
     slow: 12,
   },
   burnDustValue: 2000,
+  flyoverPegoutDiffPercentage: 2,
 };
 
 EnvironmentAccessorService.initializeEnvironmentVariables(defaultEnvironmentVariables);
diff --git a/src/pegout/components/PegoutForm.vue b/src/pegout/components/PegoutForm.vue
index 122b4408..3b899e10 100644
--- a/src/pegout/components/PegoutForm.vue
+++ b/src/pegout/components/PegoutForm.vue
@@ -12,7 +12,7 @@
       <v-col>
         <rbtc-input-amount
           @getQuotes="getQuotes"
-          :willReceive="amountToReceive" />
+          :clear="clearAmount" />
       </v-col>
     </v-row>
     <template v-if="showStep && !loadingQuotes">
@@ -40,7 +40,7 @@
           @openAddressDialog="showAddressDialog = true"
           @changeSelectedOption="changeSelectedOption"
           :selectedOption="selectedOption === quote.quoteHash"
-          :quote-differences="quoteDifferences"
+          :quote-difference="quoteDifference"
           />
       </v-col>
       <v-col cols="6">
@@ -51,7 +51,7 @@
           @openAddressDialog="showAddressDialog = true"
           @changeSelectedOption="changeSelectedOption"
           :selectedOption="selectedOption === ''"
-          :quote-differences="quoteDifferences"
+          :quote-differences="quoteDifference"
           />
       </v-col>
       </v-row>
@@ -87,33 +87,32 @@
       v-model="sendingPegout"
       class="align-center justify-center"
     >
-    <div class="d-flex flex-column align-center ga-2 rounded-circle bg-blur">
-      <v-progress-circular
-        :size="300"
-        :width="18"
-        color="warning"
-        indeterminate
-        >
-        <span class="pa-10 text-center text-balance">
-          Your transaction is being processed and will be sent to the network.
-        </span>
-      </v-progress-circular>
-      <p v-if="isLedgerConnected" class="text-warning">
-        See your Ledger device to confirm your transaction.
-      </p>
-    </div>
-
+      <div class="d-flex flex-column align-center ga-2 rounded-circle bg-blur">
+        <v-progress-circular
+          :size="300"
+          :width="18"
+          color="warning"
+          indeterminate
+          >
+          <span class="pa-10 text-center text-balance">
+            Your transaction is being processed and will be sent to the network.
+          </span>
+        </v-progress-circular>
+        <p v-if="isLedgerConnected" class="text-warning">
+          See your Ledger device to confirm your transaction.
+        </p>
+      </div>
     </v-overlay>
     <!-- Send tx error message -->
     <template v-if="showTxErrorDialog">
       <full-tx-error-dialog
       :showTxErrorDialog="showTxErrorDialog"
       :error="txError"
-      @closeErrorDialog="showTxErrorDialog = false"
+      @closeErrorDialog="clearForError"
       />
     </template>
     <quote-diff-dialog :show-dialog="showQuoteDiff"
-      :differences="quoteDifferences" @continue="continueHandler"/>
+      :differences="quoteDifference" @continue="continueHandler"/>
     <div id="recaptcha" class="g-recaptcha"
         :data-sitekey="flyoverService.siteKey"
         data-callback="onRecaptchaSuccess"
@@ -136,7 +135,7 @@ import {
 } from '@/common/store/helper';
 import { mdiArrowLeft, mdiArrowRight } from '@mdi/js';
 import {
-  FlyoverPegoutState, ObjectDifference, PegOutTxState, QuotePegOut2WP,
+  FlyoverPegoutState, PegOutTxState, QuotePegOut2WP,
   SatoshiBig, TxInfo, TxStatusType, WeiBig,
 } from '@/common/types';
 import {
@@ -146,6 +145,7 @@ import router from '@/common/router';
 import ApiService from '@/common/services/ApiService';
 import { FlyoverService } from '@/common/services';
 import FullTxErrorDialog from '@/common/components/exchange/FullTxErrorDialog.vue';
+import { EnvironmentAccessorService } from '@/common/services/enviroment-accessor.service';
 import PegoutOption from './PegoutOption.vue';
 
 export default defineComponent({
@@ -173,6 +173,7 @@ export default defineComponent({
     const showStep = ref(false);
     const isWalletAuthorizedToSign = ref(true);
     const diffShown = ref(false);
+    const clearAmount = ref(false);
 
     const pegOutTxState = useState<PegOutTxState>('pegOutTx');
     const flyoverPegoutState = useState<FlyoverPegoutState>('flyoverPegout');
@@ -188,8 +189,7 @@ export default defineComponent({
     const getPegoutQuotes = useAction('flyoverPegout', constants.FLYOVER_PEGOUT_GET_QUOTES);
     const getFlyoverProviders = useAction('flyoverPegout', constants.FLYOVER_PEGOUT_GET_PROVIDERS);
     const quotes = useStateAttribute<Record<number, QuotePegOut2WP[]>>('flyoverPegout', 'quotes');
-    const quoteDifferences = useStateAttribute<Array<ObjectDifference>>('flyoverPegout', 'differences');
-    const isFlyoverResponding = useStateAttribute<boolean>('flyoverPegout', 'isResponding');
+    const quoteDifference = useStateAttribute<number>('flyoverPegout', 'difference');
     const selectedQuote = useGetter<QuotePegOut2WP>('flyoverPegout', constants.FLYOVER_PEGOUT_GET_SELECTED_QUOTE);
     const estimatedBtcToReceive = useGetter<SatoshiBig>('pegOutTx', constants.PEGOUT_TX_GET_ESTIMATED_BTC_TO_RECEIVE);
     const isEnoughBalance = useGetter<boolean>('pegOutTx', constants.PEGOUT_TX_IS_ENOUGH_BALANCE);
@@ -197,8 +197,9 @@ export default defineComponent({
     const isTrezorConnected = useGetter<boolean>('web3Session', constants.SESSION_IS_TREZOR_CONNECTED);
     const isMetamaskConnected = useGetter<boolean>('web3Session', constants.SESSION_IS_METAMASK_CONNECTED);
     const setSelectedQuoteHash = useAction('flyoverPegout', constants.FLYOVER_PEGOUT_SET_SELECTED_QUOTE_HASH);
-    const getSelectedQuote = useGetter<QuotePegOut2WP>('flyoverPegout', constants.FLYOVER_PEGOUT_GET_SELECTED_QUOTE);
     const selectedOption = ref<string | undefined>('');
+    const quoteDiffPercentage = EnvironmentAccessorService.getEnvironmentVariables()
+      .flyoverPegoutDiffPercentage;
 
     const pegoutQuotes = computed(() => {
       const quoteList: QuotePegOut2WP[] = [];
@@ -225,7 +226,8 @@ export default defineComponent({
       return '';
     });
 
-    const showQuoteDiff = computed(() => quoteDifferences.value.length > 0 && !diffShown.value);
+    const showQuoteDiff = computed(() => quoteDifference.value > quoteDiffPercentage
+      && diffShown.value);
 
     const validAmountToReceive = computed((): boolean => estimatedBtcToReceive.value.gt(0));
 
@@ -343,23 +345,24 @@ export default defineComponent({
     }));
 
     async function send() {
+      clearAmount.value = false;
       const quoteHash = selectedOption.value;
       const type = quoteHash
         ? TxStatusType.FLYOVER_PEGOUT.toLowerCase()
         : TxStatusType.PEGOUT.toLowerCase();
       pegOutFormState.value.send('loading');
       try {
-        if (quoteHash) {
-          await sendFlyoverTx(quoteHash);
-        } else {
-          await sendTx();
-        }
+        if (quoteHash) await sendFlyoverTx(quoteHash);
+        else await sendTx();
         ApiService.registerTx(quoteHash ? registerFlyover.value : registerPegout.value);
         changePage(type);
       } catch (e) {
         if (e instanceof ServiceError) {
           handlePegoutError(e);
         }
+        if ((e as Error).toString().includes('Quote differences')) {
+          diffShown.value = true;
+        }
       } finally {
         pegOutFormState.value.send('fill');
       }
@@ -372,6 +375,11 @@ export default defineComponent({
       initPegoutTx();
       selectedOption.value = '';
       showStep.value = false;
+      diffShown.value = false;
+      showTxErrorDialog.value = false;
+      showAddressDialog.value = false;
+      loadingQuotes.value = false;
+      isWalletAuthorizedToSign.value = true;
     }
 
     function back():void {
@@ -406,21 +414,16 @@ export default defineComponent({
       showStep.value = true;
     }
 
-    const amountToReceive = computed(() => {
-      let finalAmount = '';
-      if (selectedOption.value) {
-        finalAmount = getSelectedQuote.value?.quote.value.toRBTCTrimmedString();
-      } else {
-        finalAmount = new WeiBig(estimatedBtcToReceive.value.toBTCString(), 'rbtc')
-          .minus(pegOutTxState.value.calculatedFee).toRBTCTrimmedString();
-      }
-      return new SatoshiBig(finalAmount, 'btc').toBTCTrimmedString();
-    });
-
     function continueHandler() {
       setSelectedQuoteHash('');
       selectedOption.value = undefined;
-      diffShown.value = true;
+      diffShown.value = false;
+    }
+
+    function clearForError() {
+      showTxErrorDialog.value = false;
+      clearAmount.value = true;
+      showStep.value = false;
     }
 
     onBeforeMount(() => {
@@ -452,21 +455,21 @@ export default defineComponent({
       loadingQuotes,
       sendingPegout,
       showStep,
-      quoteDifferences,
+      quoteDifference,
       showQuoteDiff,
       mdiArrowLeft,
       selectedOption,
       changeSelectedOption,
       mdiArrowRight,
-      amountToReceive,
       isFlyoverReady,
       continueHandler,
       flyoverService,
       executeRecaptcha,
       nativeQuote,
-      isFlyoverResponding,
       pegoutType: constants.pegoutType,
       isValid,
+      clearForError,
+      clearAmount,
     };
   },
 });
diff --git a/src/pegout/components/PegoutOption.vue b/src/pegout/components/PegoutOption.vue
index 009bdf2e..ddd8b86f 100644
--- a/src/pegout/components/PegoutOption.vue
+++ b/src/pegout/components/PegoutOption.vue
@@ -48,7 +48,7 @@
             {{ estimatedValueToReceive }}
             {{ environmentContext.getBtcTicker() }}
           </span>
-          <span class="text-bw-400" :class="{ 'font-weight-bold': hasChanged(['gasFee'])}">
+          <span class="text-bw-400" :class="{ 'font-weight-bold': hasChanged()}">
             USD {{ toUSD(estimatedValueToReceive) }}
           </span>
         </div>
@@ -59,11 +59,11 @@
             {{ isFlyover ? 'Total Fee (Network & Provider)' : 'Total Fee (Network)' }}
           </span>
           <span class="text-bw-400"
-                :class="{ 'font-weight-bold': hasChanged(['productFeeAmount', 'callFee'])}">
+                :class="{ 'font-weight-bold': hasChanged()}">
             {{ totalFee }}
             {{ environmentContext.getBtcTicker() }}
           </span>
-          <span class="text-bw-400" :class="{ 'font-weight-bold': hasChanged(['gasFee'])}">
+          <span class="text-bw-400" :class="{ 'font-weight-bold': hasChanged()}">
             USD {{ toUSD(totalFee) }}
           </span>
         </div>
@@ -139,10 +139,11 @@ import {
 import EnvironmentContextProviderService from '@/common/providers/EnvironmentContextProvider';
 import { useAction, useState, useStateAttribute } from '@/common/store/helper';
 import {
-  SessionState, SatoshiBig, QuotePegOut2WP, ObjectDifference,
+  SessionState, SatoshiBig, QuotePegOut2WP,
 } from '@/common/types';
 import * as constants from '@/common/store/constants';
 import { blockConfirmationsToTimeString, validateAddress } from '@/common/utils';
+import { EnvironmentAccessorService } from '@/common/services/enviroment-accessor.service';
 
 export default defineComponent({
   name: 'PegoutOption',
@@ -167,8 +168,8 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
-    quoteDifferences: {
-      type: Array<ObjectDifference>,
+    quoteDifference: {
+      type: Number,
       required: false,
     },
   },
@@ -181,6 +182,8 @@ export default defineComponent({
     const btcAddress = ref('');
     const isFlyover = computed(() => props.optionType === constants.pegoutType.FLYOVER);
     const tooltipText = 'Time is approximate and may vary due to block confirmation times and network congestion.';
+    const quoteDiffPercentage = EnvironmentAccessorService.getEnvironmentVariables()
+      .flyoverPegoutDiffPercentage;
 
     const estimatedValueToReceive = computed(() => {
       if (props.quote) {
@@ -271,17 +274,11 @@ export default defineComponent({
       context.emit('change-selected-option', props.quote ? props.quote.quoteHash : '');
     }
 
-    function hasChanged(keys: string[]): boolean {
-      let changed = false;
+    function hasChanged(): boolean {
       if (!isFlyover.value) {
         return false;
       }
-      props.quoteDifferences?.forEach((diff) => {
-        if (keys.includes(diff.key)) {
-          changed = true;
-        }
-      });
-      return changed;
+      return (props.quoteDifference ?? 0) > quoteDiffPercentage;
     }
 
     function openLink(link: string) {
diff --git a/src/pegout/components/RbtcInputAmount.vue b/src/pegout/components/RbtcInputAmount.vue
index dc200b52..85fa2ba4 100644
--- a/src/pegout/components/RbtcInputAmount.vue
+++ b/src/pegout/components/RbtcInputAmount.vue
@@ -68,12 +68,12 @@ export default defineComponent({
   name: 'RbtcInputAmount',
   emits: ['get-quotes'],
   props: {
-    willReceive: {
-      type: String,
-      required: true,
+    clear: {
+      type: Boolean,
+      required: false,
     },
   },
-  setup(_, context) {
+  setup(props, context) {
     const environmentContext = EnvironmentContextProviderService.getEnvironmentContext();
     const focus = ref(false);
     const rbtcAmount = ref('');
@@ -147,6 +147,8 @@ export default defineComponent({
         || safeAmount.value.lt(minValue);
     });
 
+    const clearProp = computed(() => props.clear);
+
     function blockLetterKeyDown(e: KeyboardEvent) {
       const allowedKeys = ['Backspace', 'Delete', 'Home', 'End', 'ArrowRight', 'ArrowLeft'];
       if (allowedKeys.includes(e.key)) return;
@@ -185,6 +187,7 @@ export default defineComponent({
     }
 
     watch(account, clearInput);
+    watch(clearProp, clearInput);
 
     return {
       amountStyle,
diff --git a/src/pegout/store/FlyoverPegout/actions.ts b/src/pegout/store/FlyoverPegout/actions.ts
index 107ed55f..d022189f 100644
--- a/src/pegout/store/FlyoverPegout/actions.ts
+++ b/src/pegout/store/FlyoverPegout/actions.ts
@@ -5,8 +5,9 @@ import {
 import { ActionTree } from 'vuex';
 import * as constants from '@/common/store/constants';
 import { BridgeService } from '@/common/services/BridgeService';
-import { compareObjects, promiseWithTimeout } from '@/common/utils';
+import { promiseWithTimeout } from '@/common/utils';
 import { ApiService } from '@/common/services';
+import { EnvironmentAccessorService } from '@/common/services/enviroment-accessor.service';
 
 export const actions: ActionTree<FlyoverPegoutState, RootState> = {
   [constants.FLYOVER_PEGOUT_INIT]: async ({ state, dispatch }) => {
@@ -23,10 +24,8 @@ export const actions: ActionTree<FlyoverPegoutState, RootState> = {
       const providers: LiquidityProvider2WP[] = await state.flyoverService.getProviders();
       commit(constants.FLYOVER_PEGOUT_SET_PROVIDERS, providers);
       result = constants.FlyoverCallResult.SUCCESS;
-      commit(constants.FLYOVER_PEGOUT_SET_RESPONDING, true);
     } catch (e) {
       console.error(`Error getting flyover providers: ${e}`);
-      commit(constants.FLYOVER_PEGOUT_SET_RESPONDING, false);
     } finally {
       try {
         await ApiService.registerFlyoverCall({ ...flyoverCallPayload, result } as FlyoverCall);
@@ -81,10 +80,8 @@ export const actions: ActionTree<FlyoverPegoutState, RootState> = {
           });
           result = constants.FlyoverCallResult.SUCCESS;
           commit(constants.FLYOVER_PEGOUT_SET_QUOTES, quotesByProvider);
-          commit(constants.FLYOVER_PEGOUT_SET_RESPONDING, true);
           resolve();
         } catch (e) {
-          commit(constants.FLYOVER_PEGOUT_SET_RESPONDING, false);
           reject();
         } finally {
           try {
@@ -110,8 +107,9 @@ export const actions: ActionTree<FlyoverPegoutState, RootState> = {
       dispatch(constants.FLYOVER_PEGOUT_USE_LIQUIDITY_PROVIDER, providerId)
         .then(() => dispatch(constants.FLYOVER_PEGOUT_GET_FINAL_QUOTE, { providerId, quoteHash }))
         .then(() => {
-          if (state.differences.length > 0) {
-            reject(new Error('Quote differences found: cannot accept quote'));
+          if (state.difference > EnvironmentAccessorService.getEnvironmentVariables()
+            .flyoverPegoutDiffPercentage) {
+            return Promise.reject(new Error('Quote differences found: cannot accept quote'));
           }
           return state.flyoverService.acceptAndSendPegoutQuote(state.selectedQuoteHash);
         })
@@ -149,14 +147,27 @@ export const actions: ActionTree<FlyoverPegoutState, RootState> = {
             productFeeAmount: quote2wp.quote.productFeeAmount,
             value: quote2wp.quote.value,
           };
-          const differences = compareObjects(
-            reducedCurrentQuote as unknown as { [key: string]: unknown },
-            reducedNewQuote as unknown as { [key: string]: unknown },
-          );
-          if (differences.length === 0) {
+          const zeroWei = new WeiBig(0, 'wei');
+          const currentQuoteTotalFee = (reducedCurrentQuote.callFee ?? zeroWei)
+            .plus(reducedCurrentQuote.gasFee ?? zeroWei)
+            .plus(reducedCurrentQuote.penaltyFee ?? zeroWei)
+            .plus(reducedCurrentQuote.productFeeAmount ?? zeroWei)
+            .plus(reducedCurrentQuote.value ?? zeroWei);
+          const newQuoteTotalFee = (reducedNewQuote.callFee ?? zeroWei)
+            .plus(reducedNewQuote.gasFee ?? zeroWei)
+            .plus(reducedNewQuote.penaltyFee ?? zeroWei)
+            .plus(reducedNewQuote.productFeeAmount ?? zeroWei)
+            .plus(reducedNewQuote.value ?? zeroWei);
+          const largest = newQuoteTotalFee
+            .gt(currentQuoteTotalFee) ? newQuoteTotalFee : currentQuoteTotalFee;
+          const minor = newQuoteTotalFee
+            .gt(currentQuoteTotalFee) ? currentQuoteTotalFee : newQuoteTotalFee;
+          const difference = ((largest.minus(minor)).mul('100')).div(largest.toRBTCString());
+          if (+difference.toRBTCString() <= EnvironmentAccessorService.getEnvironmentVariables()
+            .flyoverPegoutDiffPercentage) {
             commit(constants.FLYOVER_PEGOUT_SET_SELECTED_QUOTE, quote2wp.quoteHash);
           } else {
-            commit(constants.FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCES, differences);
+            commit(constants.FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCE, +difference.toRBTCString());
           }
         });
         resolve();
@@ -170,6 +181,6 @@ export const actions: ActionTree<FlyoverPegoutState, RootState> = {
     commit(constants.FLYOVER_PEGOUT_SET_SELECTED_QUOTE, quoteHash);
   },
   [constants.FLYOVER_PEGOUT_CLEAR_QUOTE_DIFFERENCES]: ({ commit }) => {
-    commit(constants.FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCES, []);
+    commit(constants.FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCE, 0);
   },
 };
diff --git a/src/pegout/store/FlyoverPegout/mutations.ts b/src/pegout/store/FlyoverPegout/mutations.ts
index e9ed2fff..f6f9614a 100644
--- a/src/pegout/store/FlyoverPegout/mutations.ts
+++ b/src/pegout/store/FlyoverPegout/mutations.ts
@@ -29,10 +29,7 @@ export const mutations: MutationTree<FlyoverPegoutState> = {
   [constants.FLYOVER_PEGOUT_SET_SELECTED_QUOTE]: (state, quoteHash) => {
     state.selectedQuoteHash = quoteHash;
   },
-  [constants.FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCES]: (state, differences) => {
-    state.differences = differences;
-  },
-  [constants.FLYOVER_PEGOUT_SET_RESPONDING]: (state, isResponding) => {
-    state.isResponding = isResponding;
+  [constants.FLYOVER_PEGOUT_SET_QUOTES_DIFFERENCE]: (state, difference) => {
+    state.difference = difference;
   },
 };