diff --git a/packages/boba/gateway/src/components/mainMenu/feeSwitcher/FeeSwitcher.js b/packages/boba/gateway/src/components/mainMenu/feeSwitcher/FeeSwitcher.js
index eef2054224..6124de2ccc 100644
--- a/packages/boba/gateway/src/components/mainMenu/feeSwitcher/FeeSwitcher.js
+++ b/packages/boba/gateway/src/components/mainMenu/feeSwitcher/FeeSwitcher.js
@@ -59,8 +59,30 @@ function FeeSwitcher() {
 
   const dispatchSwitchFee = useCallback(async (targetFee) => {
 
-    const tooSmallETH = new BN(logAmount(balanceETH.balance, 18)).lt(new BN(0.002))
-    const tooSmallBOBA = new BN(logAmount(balanceBOBA.balance, 18)).lt(new BN(3.0))
+    console.log("balanceBOBA:",balanceBOBA)
+    console.log("balanceETH:",balanceETH)
+
+    let tooSmallETH = false
+    let tooSmallBOBA = false
+
+    if(typeof(balanceBOBA) === 'undefined') {
+      tooSmallBOBA = true
+    } else {
+      //check actual balance
+      tooSmallBOBA = new BN(logAmount(balanceBOBA.balance, 18)).lt(new BN(3.0))
+    }
+
+    if(typeof(balanceETH) === 'undefined') {
+      tooSmallETH = true
+    } else {
+      //check actual balance
+      tooSmallETH = new BN(logAmount(balanceETH.balance, 18)).lt(new BN(0.002))
+    }
+
+    if (!balanceBOBA && !balanceETH) {
+      dispatch(openError('Wallet completely empty - please bridge in ETH or BOBA from L1'))
+      return
+    }
 
     let res
 
diff --git a/packages/boba/gateway/src/containers/modals/farm/FarmDepositModal.js b/packages/boba/gateway/src/containers/modals/farm/FarmDepositModal.js
index bda7fe4db5..d5bb5a74c8 100644
--- a/packages/boba/gateway/src/containers/modals/farm/FarmDepositModal.js
+++ b/packages/boba/gateway/src/containers/modals/farm/FarmDepositModal.js
@@ -97,13 +97,14 @@ class FarmDepositModal extends React.Component {
 
   async getMaxTransferValue() {
 
-    const { 
-      stakeToken, 
-      bobaFeeChoice, 
-      bobaFeePriceRatio, 
-      netLayer 
+    const {
+      stakeToken,
+      bobaFeeChoice,
+      bobaFeePriceRatio,
+      netLayer
     } = this.state
 
+    let max_BN = BigNumber.from(stakeToken.balance.toString())
     if (netLayer === 'L2') {
 
       let cost_BN = await networkService
@@ -111,7 +112,6 @@ class FarmDepositModal extends React.Component {
           stakeToken.currency
         )
 
-      let max_BN = BigNumber.from(stakeToken.balance.toString())
       let fee = '0'
 
       // both ETH and BOBA have 18 decimals so this is safe
@@ -133,14 +133,14 @@ class FarmDepositModal extends React.Component {
       else if (stakeToken.symbol === 'BOBA' && !bobaFeeChoice) {
         // make sure user maintains minimum BOBA in account
         max_BN = max_BN.sub(BigNumber.from(toWei_String(3.0, 18)))
-      } 
+      }
       else {
         // do not adjust max_BN
       }
 
       if(bobaFeeChoice)
         fee = utils.formatUnits(cost_BN.mul(BigNumber.from(bobaFeePriceRatio)), stakeToken.decimals)
-      else 
+      else
         fee = utils.formatUnits(cost_BN, stakeToken.decimals)
 
       // if the max amount is less than the gas,
@@ -149,17 +149,17 @@ class FarmDepositModal extends React.Component {
         max_BN = BigNumber.from('0')
       }
 
-      this.setState({ 
+      this.setState({
         max_Float_String: utils.formatUnits(max_BN, stakeToken.decimals),
         fee
       })
 
     }
     else {
-      this.setState({ 
-        max_Float_String: utils.formatUnits(stakeToken.balance, stakeToken.decimals) 
+      this.setState({
+        max_Float_String: utils.formatUnits(max_BN, stakeToken.decimals)
       })
-    } 
+    }
   }
 
   handleClose() {
@@ -168,9 +168,9 @@ class FarmDepositModal extends React.Component {
 
   handleStakeValue( value ) {
 
-    const { 
-      stakeToken, 
-      max_Float_String 
+    const {
+      stakeToken,
+      max_Float_String
     } = this.state
 
     if (value &&
@@ -193,9 +193,9 @@ class FarmDepositModal extends React.Component {
 
   async handleApprove() {
 
-    const { 
-      stakeToken, 
-      value_Wei_String 
+    const {
+      stakeToken,
+      value_Wei_String
     } = this.state
 
     this.setState({ loading: true })
@@ -228,9 +228,9 @@ class FarmDepositModal extends React.Component {
 
   async handleConfirm() {
 
-    const { 
-      stakeToken, 
-      value_Wei_String 
+    const {
+      stakeToken,
+      value_Wei_String
     } = this.state
 
     this.setState({ loading: true })
@@ -261,7 +261,7 @@ class FarmDepositModal extends React.Component {
       max_Float_String,
       netLayer,
       bobaFeeChoice,
-      fee 
+      fee
     } = this.state
 
     const { approvedAllowance } = this.props.farm
@@ -273,14 +273,14 @@ class FarmDepositModal extends React.Component {
       new BN(approvedAllowance).gte(powAmount(stakeValue, stakeToken.decimals))
     ) {
       allowanceGTstake = true
-    } else if (Number(stakeValue) > 0 && 
+    } else if (Number(stakeValue) > 0 &&
       stakeToken.symbol === 'ETH'
     ) {
       //do not need to approve ETH
       allowanceGTstake = true
     }
 
-    // we do this because there is no fee estimation logic (yet) for this 
+    // we do this because there is no fee estimation logic (yet) for this
     // on L1
     let allowUseAll = netLayer === 'L2' ? true : false
 
diff --git a/packages/boba/gateway/src/containers/save/Save.js b/packages/boba/gateway/src/containers/save/Save.js
index 4c0fe29315..929886b022 100644
--- a/packages/boba/gateway/src/containers/save/Save.js
+++ b/packages/boba/gateway/src/containers/save/Save.js
@@ -133,45 +133,46 @@ class Save extends React.Component {
 
   async getMaxTransferValue () {
 
-    const { 
-      layer2, 
-      bobaFeeChoice, 
-      bobaFeePriceRatio 
+    const {
+      layer2,
+      bobaFeeChoice,
+      bobaFeePriceRatio,
+      netLayer
     } = this.state
-    
+
     // as staking BOBA check the bobabalance
     const token = Object.values(layer2).find((t) => t[ 'symbolL2' ] === 'BOBA')
-    console.log("Token:",token)
 
     // BOBA available prepare transferEstimate
     if (token) {
-      //console.log("balance:",token.balance.toString())
-      let cost_BN = await networkService.savingEstimate()
-      console.log([ `cost_BN`, cost_BN ])
+
       let max_BN = BigNumber.from(token.balance.toString())
       let fee = '0'
 
-      if (bobaFeeChoice) {
-        // we are staking BOBA and paying in BOBA
-        // so need to subtract the BOBA fee
-        max_BN = max_BN.sub(cost_BN.mul(BigNumber.from(bobaFeePriceRatio)))
+      if (netLayer === 'L2') {
+        let cost_BN = await networkService.savingEstimate()
+        console.log([ `cost_BN`, cost_BN ])
+        if (bobaFeeChoice) {
+          // we are staking BOBA and paying in BOBA
+          // so need to subtract the BOBA fee
+          max_BN = max_BN.sub(cost_BN.mul(BigNumber.from(bobaFeePriceRatio)))
+        }
+
+        // make sure user maintains minimum BOBA in account
+        max_BN = max_BN.sub(BigNumber.from(toWei_String(3.0, 18)))
+
+        if (bobaFeeChoice)
+          fee = utils.formatUnits(cost_BN.mul(BigNumber.from(bobaFeePriceRatio)), token.decimals)
+        else
+          fee = utils.formatUnits(cost_BN, token.decimals)
       }
-
-      // make sure user maintains minimum BOBA in account
-      max_BN = max_BN.sub(BigNumber.from(toWei_String(3.0, 18)))
-      
-      if(bobaFeeChoice)
-        fee = utils.formatUnits(cost_BN.mul(BigNumber.from(bobaFeePriceRatio)), token.decimals)
-      else 
-        fee = utils.formatUnits(cost_BN, token.decimals)
-
       // if the max amount is less than the gas,
       // set the max amount to zero
       if (max_BN.lt(BigNumber.from('0'))) {
         max_BN = BigNumber.from('0')
       }
 
-      this.setState({ 
+      this.setState({
         max_Float_String: utils.formatUnits(max_BN, token.decimals),
         fee
       })
@@ -182,8 +183,8 @@ class Save extends React.Component {
 
   handleStakeValue(value) {
 
-    const { 
-      max_Float_String 
+    const {
+      max_Float_String
     } = this.state
 
     if( value &&
@@ -228,7 +229,7 @@ class Save extends React.Component {
       loading,
       max_Float_String,
       bobaFeeChoice,
-      fee 
+      fee
     } = this.state
 
     let totalBOBAstaked = 0
diff --git a/packages/boba/gateway/src/containers/wallet/Wallet.js b/packages/boba/gateway/src/containers/wallet/Wallet.js
index 498abe5e81..6844678c63 100644
--- a/packages/boba/gateway/src/containers/wallet/Wallet.js
+++ b/packages/boba/gateway/src/containers/wallet/Wallet.js
@@ -3,12 +3,12 @@ import { useDispatch, useSelector } from 'react-redux'
 
 import Button from 'components/button/Button'
 
-import { Circle } from "@mui/icons-material"
-import { Box, CircularProgress, Typography } from '@mui/material'
+import { Circle, Info } from "@mui/icons-material"
+import { Box, CircularProgress, Icon, Typography } from '@mui/material'
 import Link from 'components/icons/LinkIcon'
 
 import { switchChain, getETHMetaTransaction } from 'actions/setupAction'
-import { openAlert, setActiveHistoryTab, setPage as setPageAction } from 'actions/uiAction'
+import { openAlert, openError, setActiveHistoryTab, setPage as setPageAction } from 'actions/uiAction'
 import { fetchTransactions } from 'actions/networkAction'
 
 import Tabs from 'components/tabs/Tabs'
@@ -104,13 +104,27 @@ function Wallet() {
 
       if (l2BalanceETH && l2BalanceETH.balance) {
         setTooSmallETH(new BN(logAmount(l2BalanceETH.balance, 18)).lt(new BN(0.003)))
+      } else {
+        // in case of zero ETH balance we are setting tooSmallETH
+        setTooSmallETH(true)
       }
-      if (l2BalanceBOBA && l2BalanceBOBA) {
+      if (l2BalanceBOBA && l2BalanceBOBA.balance) {
         setTooSmallBOBA(new BN(logAmount(l2BalanceBOBA.balance, 18)).lt(new BN(4.0)))
+      } else {
+        // in case of zero BOBA balance we are setting tooSmallBOBA
+        setTooSmallBOBA(true)
       }
     }
   },[ l2Balances, accountEnabled ])
 
+  useEffect(() => {
+    if (layer === 'L2') {
+      if (tooSmallBOBA && tooSmallETH) {
+        dispatch(openError('Wallet empty - please bridge in ETH or BOBA from L1'))
+      }
+    }
+  },[tooSmallETH, tooSmallBOBA, layer, dispatch])
+
   useInterval(() => {
     if (accountEnabled) {
       dispatch(fetchTransactions())
@@ -150,16 +164,19 @@ function Wallet() {
       {layer === 'L2' && tooSmallETH && network === 'rinkeby' &&
         <S.LayerAlert>
           <S.AlertInfo>
-            <AlertIcon />
-            <S.AlertText
-              variant="body3"
+            {/* <AlertIcon /> */}
+            <Icon as={Info} sx={{color:"#BAE21A"}}/>
+            <Typography
+              flex={4}
+              variant="body2"
               component="p"
+              ml={2}
+              style={{ opacity: '0.6' }}
             >
-              <span style={{opacity: '0.6'}}>Using Boba requires a minimum ETH balance (of 0.002 ETH)
-              regardless of your fee setting, otherwise MetaMask may incorrectly reject transactions.
-              If you ran out of ETH, use EMERGENCY SWAP to swap BOBA for 0.05 ETH at market rates.
-              </span>
-            </S.AlertText>
+              Using Boba requires a minimum ETH balance (of 0.002 ETH) regardless of your fee setting, 
+              otherwise MetaMask may incorrectly reject transactions. If you ran out of ETH, use 
+              EMERGENCY SWAP to swap BOBA for 0.05 ETH at market rates.
+            </Typography>
           </S.AlertInfo>
           <Button
             onClick={()=>{emergencySwap()}}
diff --git a/packages/boba/gateway/src/containers/wallet/token/Token.js b/packages/boba/gateway/src/containers/wallet/token/Token.js
index ff4f08e09a..b465e6f031 100644
--- a/packages/boba/gateway/src/containers/wallet/token/Token.js
+++ b/packages/boba/gateway/src/containers/wallet/token/Token.js
@@ -98,7 +98,7 @@ function TokenPage() {
               href={'https://oolongswap.com/'}
               aria-label="link"
               style={{fontSize: '1.0em', opacity: '0.9', paddingLeft: '3px'}}
-            >Oologswap <Link />
+            >Oolongswap <Link />
             </S.footerLink>
           </Typography>
         </Box>
diff --git a/packages/boba/gateway/src/services/networkService.js b/packages/boba/gateway/src/services/networkService.js
index 0ecafc26cf..334cbf1868 100644
--- a/packages/boba/gateway/src/services/networkService.js
+++ b/packages/boba/gateway/src/services/networkService.js
@@ -1239,7 +1239,7 @@ class NetworkService {
               }
               if(value.meta.attributes[3].value === 'crown') topTop = 1
               if(value.meta.attributes[4].value === 'wizzard') topMagic = 1
-              validMonsters.push({tokenID: value.tokenID, attributes}) 
+              validMonsters.push({tokenID: value.tokenID, attributes})
             }
           }
         }
@@ -2643,7 +2643,7 @@ class NetworkService {
     if( currency === allAddresses.L1_ETH_Address || currency === allAddresses.L2_ETH_Address ) {
       // console.log("Yes we have ETH")
       // add value field
-      otherField['value'] = value_Wei_String 
+      otherField['value'] = value_Wei_String
     }
 
     try {
@@ -2668,17 +2668,17 @@ class NetworkService {
   async liquidityEstimate(currency) {
 
     const benchmarkAccount = '0x4161aEf7ac9F8772B83Cda1E5F054ADe308d9049'
-    
-    let otherField = { 
+
+    let otherField = {
       from: benchmarkAccount
     }
 
     const gasPrice_BN = await this.provider.getGasPrice()
     console.log("gas price", gasPrice_BN.toString())
-    
+
     let approvalCost_BN = BigNumber.from('0')
     let stakeCost_BN = BigNumber.from('0')
-    
+
     try {
 
       // first, we need the allowance of the benchmarkAccount
@@ -2695,9 +2695,9 @@ class NetworkService {
       console.log("benchmarkAllowance", allowance_BN.toString() )
 
       if( currency === allAddresses.L2_ETH_Address ) {
-        otherField['value'] = allowance_BN.toString() 
+        otherField['value'] = allowance_BN.toString()
       }
-      
+
       // second, we need the approval cost if non-ETH
       if( currency !== allAddresses.L2_ETH_Address ) {
 
@@ -2705,7 +2705,7 @@ class NetworkService {
           .populateTransaction
           .approve(
             allAddresses.L2LPAddress,
-            allowance_BN.toString(), 
+            allowance_BN.toString(),
             otherField
           )
 
@@ -2713,7 +2713,7 @@ class NetworkService {
         approvalCost_BN = approvalGas_BN.mul(gasPrice_BN)
         console.log("Approve cost in ETH:", utils.formatEther(approvalCost_BN))
       }
-       
+
       // third, we need the addLiquidity cost
       const tx2 = await this.L2LPContract
         .connect(this.provider)
@@ -2736,7 +2736,7 @@ class NetworkService {
       console.log('NS: liquidityEstimate() error', error)
       return error
     }
-  
+
   }
 
   /***********************************************/
@@ -3938,21 +3938,21 @@ class NetworkService {
   }
 
   async savingEstimate() {
-    
+
     // used to generate gas estimates for contracts that cannot set amount === 0
     // to avoid need to approve amount
     const benchmarkAccount = '0x4161aEf7ac9F8772B83Cda1E5F054ADe308d9049'
-    
-    let otherField = { 
+
+    let otherField = {
       from: benchmarkAccount
     }
 
     const gasPrice_BN = await this.provider.getGasPrice()
     console.log("gas price", gasPrice_BN.toString())
-    
+
     let approvalCost_BN = BigNumber.from('0')
     let stakeCost_BN = BigNumber.from('0')
-    
+
     try {
 
       // first, we need the allowance of the benchmarkAccount
@@ -3970,7 +3970,7 @@ class NetworkService {
         .populateTransaction
         .approve(
           allAddresses.BobaFixedSavings,
-          allowance_BN.toString(), 
+          allowance_BN.toString(),
         )
 
       const approvalGas_BN = await this.provider.estimateGas(tx1)