diff --git a/ui/app/components/app/token-list/token-list.js b/ui/app/components/app/token-list/token-list.js
index cc0a4acaf..591dbe33a 100644
--- a/ui/app/components/app/token-list/token-list.js
+++ b/ui/app/components/app/token-list/token-list.js
@@ -1,6 +1,5 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import contracts from 'eth-contract-metadata'
 import { isEqual } from 'lodash'
 
 import TokenCell from '../token-cell'
@@ -10,15 +9,6 @@ import { useSelector } from 'react-redux'
 import { getAssetImages } from '../../../selectors'
 import { getTokens } from '../../../ducks/metamask/metamask'
 
-const defaultTokens = []
-for (const address in contracts) {
-  const contract = contracts[address]
-  if (contract.erc20) {
-    contract.address = address
-    defaultTokens.push(contract)
-  }
-}
-
 export default function TokenList ({ onTokenClick }) {
   const t = useI18nContext()
   const assetImages = useSelector(getAssetImages)
diff --git a/ui/app/pages/add-token/token-search/token-search.component.js b/ui/app/pages/add-token/token-search/token-search.component.js
index 9cb3425b3..82aaae3fc 100644
--- a/ui/app/pages/add-token/token-search/token-search.component.js
+++ b/ui/app/pages/add-token/token-search/token-search.component.js
@@ -6,7 +6,7 @@ import InputAdornment from '@material-ui/core/InputAdornment'
 import TextField from '../../../components/ui/text-field'
 
 const contractList = Object.entries(contractMap)
-  .map(([ _, tokenData]) => tokenData)
+  .map(([address, tokenData]) => Object.assign({}, tokenData, { address }))
   .filter((tokenData) => Boolean(tokenData.erc20))
 
 const fuse = new Fuse(contractList, {