diff --git a/package.json b/package.json
index 7c09e4a78..468c0bfbd 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@galacticcouncil/math-staking": "^1.0.0",
     "@galacticcouncil/math-xyk": "^1.0.0",
     "@galacticcouncil/sdk": "^3.0.1",
-    "@galacticcouncil/ui": "^4.0.2",
+    "@galacticcouncil/ui": "^4.0.3",
     "@galacticcouncil/xcm-cfg": "^2.5.0",
     "@galacticcouncil/xcm-core": "^1.4.0",
     "@galacticcouncil/xcm-sdk": "^3.3.0",
diff --git a/src/sections/trade/sections/swap/SwapPage.tsx b/src/sections/trade/sections/swap/SwapPage.tsx
index a8423203d..de8d273dd 100644
--- a/src/sections/trade/sections/swap/SwapPage.tsx
+++ b/src/sections/trade/sections/swap/SwapPage.tsx
@@ -14,11 +14,9 @@ import { useAccount } from "sections/web3-connect/Web3Connect.utils"
 import { useDisplayAssetStore } from "utils/displayAsset"
 import { isEvmAccount } from "utils/evm"
 import { NATIVE_ASSET_ID } from "utils/api"
-import { useRemount } from "hooks/useRemount"
 import { ExternalAssetImportModal } from "sections/trade/modal/ExternalAssetImportModal"
 import { AddTokenModal } from "sections/wallet/addToken/modal/AddTokenModal"
 import { useState } from "react"
-import { useUserExternalTokenStore } from "sections/wallet/addToken/AddToken.utils"
 
 const defaultEvmTokenId: string = import.meta.env.VITE_EVM_NATIVE_ASSET_ID
 
@@ -61,14 +59,8 @@ export function SwapPage() {
   const { stableCoinId } = useDisplayAssetStore()
   const preference = useProviderRpcUrlStore()
   const [addToken, setAddToken] = useState(false)
-  const { tokens: externalTokensStored } = useUserExternalTokenStore.getState()
 
   const isEvm = isEvmAccount(account?.address)
-  const version = useRemount([
-    isEvm,
-    externalTokensStored[preference.getDataEnv()].length,
-  ])
-
   const rpcUrl = preference.rpcUrl ?? import.meta.env.VITE_PROVIDER_URL
 
   const rawSearch = useSearch<SearchGenerics>()
@@ -125,7 +117,6 @@ export function SwapPage() {
   return (
     <SContainer>
       <SwapApp
-        key={version}
         ref={(r) => {
           if (r) {
             r.setAttribute("chart", "")
diff --git a/yarn.lock b/yarn.lock
index be010dfb5..e653b4152 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2646,10 +2646,10 @@
     bignumber.js "^9.1.0"
     lodash.clonedeep "^4.5.0"
 
-"@galacticcouncil/ui@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@galacticcouncil/ui/-/ui-4.0.2.tgz#85ad9ca689bed0b6196ad8d94f84739befe0c5f8"
-  integrity sha512-1VxyDZTbuXu8BIKco3yxzmdjbZIy6hn1pqhkUq4nPa6PqBIab3hNScHwah4hL+F4znT1eGRHbRqb9H5W9SaFbA==
+"@galacticcouncil/ui@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@galacticcouncil/ui/-/ui-4.0.3.tgz#23f633e104e805f33f43e676f2e41b061c8c6f8c"
+  integrity sha512-BvNOkfS03p3l3kij+tOK2HAgTVDcyT3uCyY/YnYMA73mJFJIX3biG9iAaxKwhCskKA0yXlaX7c+yoPKX97KE+g==
   dependencies:
     "@floating-ui/dom" "^1.5.1"
     "@lit/reactive-element" "^1.0.0"