1 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/components/send/send-content/send-gas-row/send-gas-row.container.js b/ui/app/components/send/send-content/send-gas-row/send-gas-row.container.js
index a3bc73256..50cb47178 100644
--- a/ui/app/components/send/send-content/send-gas-row/send-gas-row.container.js
+++ b/ui/app/components/send/send-content/send-gas-row/send-gas-row.container.js
@@ -74,12 +74,16 @@ function mapDispatchToProps (dispatch) {
     setGasPrice: (newPrice, gasLimit) => {
       dispatch(setGasPrice(newPrice))
       dispatch(setCustomGasPrice(newPrice))
-      dispatch(setGasTotal(calcGasTotal(gasLimit, newPrice)))
+      if (gasLimit) {
+        dispatch(setGasTotal(calcGasTotal(gasLimit, newPrice)))
+      }
     },
     setGasLimit: (newLimit, gasPrice) => {
       dispatch(setGasLimit(newLimit))
       dispatch(setCustomGasLimit(newLimit))
-      dispatch(setGasTotal(calcGasTotal(newLimit, gasPrice)))
+      if (gasPrice) {
+        dispatch(setGasTotal(calcGasTotal(newLimit, gasPrice)))
+      }
     },
     showGasButtonGroup: () => dispatch(showGasButtonGroup()),
     resetCustomData: () => dispatch(resetCustomData()),