diff --git a/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.container.js b/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
index 800ec7abc..f1cc41f7b 100644
--- a/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
+++ b/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.container.js
@@ -10,6 +10,7 @@ import {
 } from '../../store/actions';
 import {
   getTargetAccountWithSendEtherInfo,
+  unconfirmedTransactionsListSelector,
   conversionRateSelector,
 } from '../../selectors';
 import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
@@ -18,11 +19,12 @@ import ConfirmDecryptMessage from './confirm-decrypt-message.component';
 
 function mapStateToProps(state) {
   const {
-    confirmTransaction,
     metamask: { domainMetadata = {} },
   } = state;
 
-  const { txData = {} } = confirmTransaction;
+  const unconfirmedTransactions = unconfirmedTransactionsListSelector(state);
+
+  const txData = unconfirmedTransactions[0];
 
   const {
     msgParams: { from },
diff --git a/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js b/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
index ee8061dcf..3439589b6 100644
--- a/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
+++ b/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js
@@ -10,6 +10,7 @@ import {
 
 import {
   conversionRateSelector,
+  unconfirmedTransactionsListSelector,
   getTargetAccountWithSendEtherInfo,
 } from '../../selectors';
 
@@ -19,11 +20,12 @@ import ConfirmEncryptionPublicKey from './confirm-encryption-public-key.componen
 
 function mapStateToProps(state) {
   const {
-    confirmTransaction,
     metamask: { domainMetadata = {} },
   } = state;
 
-  const { txData = {} } = confirmTransaction;
+  const unconfirmedTransactions = unconfirmedTransactionsListSelector(state);
+
+  const txData = unconfirmedTransactions[0];
 
   const { msgParams: from } = txData;