diff --git a/src/Facets/StargateFacet.sol b/src/Facets/StargateFacet.sol
index e22b6d095..bf06a2c01 100644
--- a/src/Facets/StargateFacet.sol
+++ b/src/Facets/StargateFacet.sol
@@ -146,9 +146,7 @@ contract StargateFacet is ILiFi, ReentrancyGuard, SwapperV2, Validatable {
             _bridgeData.minAmount,
             _swapData,
             payable(msg.sender),
-            LibAsset.isNativeAsset(_bridgeData.sendingAssetId)
-                ? 0
-                : _stargateData.lzFee
+            _stargateData.lzFee
         );
 
         _startBridge(_bridgeData, _stargateData);
@@ -182,12 +180,12 @@ contract StargateFacet is ILiFi, ReentrancyGuard, SwapperV2, Validatable {
         StargateData calldata _stargateData
     ) private {
         if (LibAsset.isNativeAsset(_bridgeData.sendingAssetId)) {
-            composer.swapETHAndCall{ value: _bridgeData.minAmount }(
+            composer.swapETHAndCall{ value: _bridgeData.minAmount + _stargateData.lzFee}(
                 getLayerZeroChainId(_bridgeData.destinationChainId),
                 _stargateData.refundAddress,
                 _stargateData.callTo,
                 IStargateRouter.SwapAmount(
-                    _bridgeData.minAmount - _stargateData.lzFee,
+                    _bridgeData.minAmount,
                     _stargateData.minAmountLD
                 ),
                 IStargateRouter.lzTxObj(
diff --git a/test/solidity/Facets/StargateFacet.t.sol b/test/solidity/Facets/StargateFacet.t.sol
index 56f67869b..917219658 100644
--- a/test/solidity/Facets/StargateFacet.t.sol
+++ b/test/solidity/Facets/StargateFacet.t.sol
@@ -136,7 +136,7 @@ contract StargateFacetTest is TestBaseFacet {
     function initiateBridgeTxWithFacet(bool isNative) internal override {
         if (isNative) {
             stargateFacet.startBridgeTokensViaStargate{
-                value: bridgeData.minAmount
+                value: bridgeData.minAmount + addToMessageValue
             }(bridgeData, stargateData);
         } else {
             stargateFacet.startBridgeTokensViaStargate{