Merge branch 'master' into PopupNotifications

1 files changed, 1 insertions, 1 deletions

diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index f832b8a4b..22d29383f 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -36,7 +36,7 @@ ConfirmTxScreen.prototype.render = function () {
   var unconfMsgs = state.unconfMsgs
   var unconfTxList = txHelper(unconfTxs, unconfMsgs)
   var index = state.index !== undefined ? state.index : 0
-  var txData = unconfTxList[index] || {}
+  var txData = unconfTxList[index] || unconfTxList[0] || {}
   var isNotification = isPopupOrNotification() === 'notification'
 
   return (