diff --git a/libs/oeth/swap/src/hooks.ts b/libs/oeth/swap/src/hooks.ts
index 2508f7ac7..97287999e 100644
--- a/libs/oeth/swap/src/hooks.ts
+++ b/libs/oeth/swap/src/hooks.ts
@@ -22,8 +22,10 @@ export const useHandleAmountInChange = () => {
     (amount: bigint) => {
       setSwapState(
         produce((state) => {
-          state.amountIn = amount;
-          state.isSwapRoutesLoading = amount !== 0n;
+          if (state.amountIn !== amount) {
+            state.amountIn = amount;
+            state.isSwapRoutesLoading = amount !== 0n;
+          }
         }),
       );
     },
diff --git a/libs/shared/providers/src/wagmi/components/AddressLabel.tsx b/libs/shared/providers/src/wagmi/components/AddressLabel.tsx
index 05d0c79b3..26900dd47 100644
--- a/libs/shared/providers/src/wagmi/components/AddressLabel.tsx
+++ b/libs/shared/providers/src/wagmi/components/AddressLabel.tsx
@@ -26,12 +26,6 @@ export const AddressLabel = ({
     chainId: mainnet.id,
   });
 
-  if (short) {
-    return (
-      <MiddleTruncated {...rest}>{middleTruncate(address)}</MiddleTruncated>
-    );
-  }
-
   if (enableEnsName) {
     return isEnsNameLoading ? (
       <Skeleton sx={{ minWidth: 100, ...rest?.sx }} />
@@ -42,5 +36,11 @@ export const AddressLabel = ({
     );
   }
 
+  if (short) {
+    return (
+      <MiddleTruncated {...rest}>{middleTruncate(address)}</MiddleTruncated>
+    );
+  }
+
   return <MiddleTruncated textProps={{ ...rest }}>{address}</MiddleTruncated>;
 };