diff --git a/nym-wallet/src/pages/bond/components/GatewayForm.tsx b/nym-wallet/src/pages/bond/components/GatewayForm.tsx
index 7653f7c2bc..3dd221a3da 100644
--- a/nym-wallet/src/pages/bond/components/GatewayForm.tsx
+++ b/nym-wallet/src/pages/bond/components/GatewayForm.tsx
@@ -330,9 +330,7 @@ export const GatewayForm = ({
           type="submit"
           data-testid="submit-button"
           disableElevation
-          onClick={handleSubmit((data) =>
-            handleValidateAndGetFee(data, data.tokenPool === 'balance' ? bondGateway : vestingBondGateway),
-          )}
+          onClick={handleSubmit(handleValidateAndGetFee)}
           endIcon={isSubmitting && <CircularProgress size={20} />}
           size="large"
         >
diff --git a/nym-wallet/src/pages/bond/components/MixnodeForm.tsx b/nym-wallet/src/pages/bond/components/MixnodeForm.tsx
index d167248027..b476156b7f 100644
--- a/nym-wallet/src/pages/bond/components/MixnodeForm.tsx
+++ b/nym-wallet/src/pages/bond/components/MixnodeForm.tsx
@@ -348,9 +348,7 @@ export const MixnodeForm = ({
             type="submit"
             data-testid="submit-button"
             disableElevation
-            onClick={handleSubmit((data) =>
-              handleValidateAndGetFee(data, data.tokenPool === 'balance' ? bondMixNode : vestingBondMixNode),
-            )}
+            onClick={handleSubmit(handleValidateAndGetFee)}
             endIcon={isSubmitting && <CircularProgress size={20} />}
             size="large"
           >