diff --git a/ui/app/components/app/transaction-activity-log/transaction-activity-log.component.js b/ui/app/components/app/transaction-activity-log/transaction-activity-log.component.js
index d23d0fc71..b5618b83b 100644
--- a/ui/app/components/app/transaction-activity-log/transaction-activity-log.component.js
+++ b/ui/app/components/app/transaction-activity-log/transaction-activity-log.component.js
@@ -118,6 +118,10 @@ export default class TransactionActivityLog extends PureComponent {
     const { t } = this.context
     const { className, activities } = this.props
 
+    if (activities.length === 0) {
+      return null
+    }
+
     return (
       <div className={classnames('transaction-activity-log', className)}>
         <div className="transaction-activity-log__title">
diff --git a/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.component.js b/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.component.js
index c9196cde2..94762bc2e 100644
--- a/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.component.js
+++ b/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.component.js
@@ -35,12 +35,12 @@ export default class TransactionListItemDetails extends PureComponent {
     title: PropTypes.string.isRequired,
     onClose: PropTypes.func.isRequired,
     recipientEns: PropTypes.string,
-    recipientAddress: PropTypes.string.isRequired,
+    recipientAddress: PropTypes.string,
     rpcPrefs: PropTypes.object,
     senderAddress: PropTypes.string.isRequired,
     tryReverseResolveAddress: PropTypes.func.isRequired,
     senderNickname: PropTypes.string.isRequired,
-    recipientNickname: PropTypes.string.isRequired,
+    recipientNickname: PropTypes.string,
   }
 
   state = {
@@ -95,10 +95,12 @@ export default class TransactionListItemDetails extends PureComponent {
     })
   }
 
-  async componentDidMount () {
+  componentDidMount () {
     const { recipientAddress, tryReverseResolveAddress } = this.props
 
-    tryReverseResolveAddress(recipientAddress)
+    if (recipientAddress) {
+      tryReverseResolveAddress(recipientAddress)
+    }
   }
 
   renderCancel () {
diff --git a/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.container.js b/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.container.js
index 226d1b46a..c9d48bf7e 100644
--- a/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.container.js
+++ b/ui/app/components/app/transaction-list-item-details/transaction-list-item-details.container.js
@@ -10,8 +10,11 @@ const mapStateToProps = (state, ownProps) => {
     ensResolutionsByAddress,
   } = metamask
   const { recipientAddress, senderAddress } = ownProps
-  const address = checksumAddress(recipientAddress)
-  const recipientEns = ensResolutionsByAddress[address] || ''
+  let recipientEns
+  if (recipientAddress) {
+    const address = checksumAddress(recipientAddress)
+    recipientEns = ensResolutionsByAddress[address] || ''
+  }
   const addressBook = getAddressBook(state)
 
   const getNickName = (address) => {
@@ -26,7 +29,7 @@ const mapStateToProps = (state, ownProps) => {
     rpcPrefs,
     recipientEns,
     senderNickname: getNickName(senderAddress),
-    recipientNickname: getNickName(recipientAddress),
+    recipientNickname: recipientAddress ? getNickName(recipientAddress) : null,
   }
 }
 
diff --git a/ui/app/components/app/transaction-list-item/transaction-list-item.component.js b/ui/app/components/app/transaction-list-item/transaction-list-item.component.js
index d12da6006..e22345916 100644
--- a/ui/app/components/app/transaction-list-item/transaction-list-item.component.js
+++ b/ui/app/components/app/transaction-list-item/transaction-list-item.component.js
@@ -13,7 +13,7 @@ import { useCancelTransaction } from '../../../hooks/useCancelTransaction'
 import { useRetryTransaction } from '../../../hooks/useRetryTransaction'
 import Button from '../../ui/button'
 import Tooltip from '../../ui/tooltip'
-import TransactionListItemDetails from '../transaction-list-item-details/transaction-list-item-details.component'
+import TransactionListItemDetails from '../transaction-list-item-details'
 import { useHistory } from 'react-router-dom'
 import { CONFIRM_TRANSACTION_ROUTE } from '../../../helpers/constants/routes'
 import {
diff --git a/ui/app/components/app/transaction-list/transaction-list.component.js b/ui/app/components/app/transaction-list/transaction-list.component.js
index e089e75c6..46b8b45de 100644
--- a/ui/app/components/app/transaction-list/transaction-list.component.js
+++ b/ui/app/components/app/transaction-list/transaction-list.component.js
@@ -112,7 +112,7 @@ export default function TransactionList ({ tokenAddress }) {
                 </div>
               )
           }
-          {(completedTransactions.length - limit + PAGE_INCREMENT) > 0 && (
+          {completedTransactions.length > limit && (
             <Button className="transaction-list__view-more" type="secondary" rounded onClick={viewMore}>View More</Button>
           )}
         </div>