diff --git a/src/screens/SendConfirmationSheet.tsx b/src/screens/SendConfirmationSheet.tsx
index 9d1613e22b5..4059d09a924 100644
--- a/src/screens/SendConfirmationSheet.tsx
+++ b/src/screens/SendConfirmationSheet.tsx
@@ -669,8 +669,16 @@ export const SendConfirmationSheet = () => {
             />
           </SendButtonWrapper>
           {isENS && (
-            /* @ts-expect-error JavaScript component */
-            <GasSpeedButton chainId={ethereumUtils.getChainIdFromNetwork(network)} theme={theme.isDarkMode ? 'dark' : 'light'} />
+            <GasSpeedButton
+              asset={undefined}
+              fallbackColor={undefined}
+              testID={undefined}
+              showGasOptions={undefined}
+              validateGasParams={undefined}
+              crossChainServiceTime={undefined}
+              chainId={chainId}
+              theme={theme.isDarkMode ? 'dark' : 'light'}
+            />
           )}
         </Column>
       </SlackSheet>
diff --git a/src/screens/SendSheet.js b/src/screens/SendSheet.js
index 3cff2615a5b..a2c9e95f960 100644
--- a/src/screens/SendSheet.js
+++ b/src/screens/SendSheet.js
@@ -762,7 +762,15 @@ export default function SendSheet(props) {
     const assetChainId = selected.chainId;
     const currentProviderChainId = currentProvider._network.chainId;
 
-    if (assetChainId === currentChainId && currentProviderChainId === currentChainId && isValidAddress && !isEmpty(selected)) {
+    if (
+      !!accountAddress &&
+      amountDetails.assetAmount !== '' &&
+      Object.entries(selected).length &&
+      assetChainId === currentChainId &&
+      currentProviderChainId === currentChainId &&
+      isValidAddress &&
+      !isEmpty(selected)
+    ) {
       estimateGasLimit(
         {
           address: accountAddress,