diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2d2b6ea80..332da39b0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Features
 
-- Implemented the wallet Tokens dedicated screen ([PR 2671](https://github.com/input-output-hk/daedalus/pull/2671), [PR 2701](https://github.com/input-output-hk/daedalus/pull/2701))
+- Implemented the wallet Tokens dedicated screen ([PR 2671](https://github.com/input-output-hk/daedalus/pull/2671), [PR 2701](https://github.com/input-output-hk/daedalus/pull/2701), [PR 2703](https://github.com/input-output-hk/daedalus/pull/2703))
 
 ### Fixes
 
diff --git a/source/renderer/app/components/wallet/tokens/WalletToken.js b/source/renderer/app/components/wallet/tokens/WalletToken.js
index b95be622b0..4326f5aed2 100644
--- a/source/renderer/app/components/wallet/tokens/WalletToken.js
+++ b/source/renderer/app/components/wallet/tokens/WalletToken.js
@@ -157,28 +157,14 @@ const WalletToken = observer((props: Props) => {
         <SVGInline svg={arrow} className={arrowStyles} />
       </div>
     );
-  }, [asset, isExpanded, arrowStyles]);
-
-  const footer = useMemo(() => {
-    return (
-      <div className={styles.footer}>
-        <dl>
-          <dt>{intl.formatMessage(messages.amountLabel)}</dt>
-          <dd>
-            {' '}
-            <AssetAmount
-              amount={asset.quantity}
-              metadata={asset.metadata}
-              decimals={asset.decimals}
-              isLoading={isLoading}
-              className={styles.assetAmount}
-            />
-          </dd>
-        </dl>
-        {buttons}
-      </div>
-    );
-  }, [asset, isLoading, intl]);
+  }, [
+    asset,
+    isExpanded,
+    arrowStyles,
+    onToggleFavorite,
+    isFavorite,
+    favoriteIconStyles,
+  ]);
 
   const buttons = useMemo(() => {
     const { recommendedDecimals, decimals } = asset;
@@ -235,6 +221,27 @@ const WalletToken = observer((props: Props) => {
     );
   }, [asset, onOpenAssetSend, onAssetSettings, intl]);
 
+  const footer = useMemo(() => {
+    return (
+      <div className={styles.footer}>
+        <dl>
+          <dt>{intl.formatMessage(messages.amountLabel)}</dt>
+          <dd>
+            {' '}
+            <AssetAmount
+              amount={asset.quantity}
+              metadata={asset.metadata}
+              decimals={asset.decimals}
+              isLoading={isLoading}
+              className={styles.assetAmount}
+            />
+          </dd>
+        </dl>
+        {buttons}
+      </div>
+    );
+  }, [asset, isLoading, intl, buttons]);
+
   const { isInsertingAsset, isRemovingAsset } = props;
   const componentStyles = classNames(styles.component, {
     [styles.isExpanded]: isExpanded,