diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 88448311d2..0449c2b4fd 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1463,7 +1463,7 @@ export default createReactClass({
                     dis.dispatch({
                         action: "show_toast",
                         toast: {
-                            key: request.event.getId(),
+                            key: request.channel.transactionId,
                             title: _t("Verification Request"),
                             icon: "verification",
                             props: {request},
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.js
index 7992933864..e3f3b86940 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.js
@@ -30,7 +30,7 @@ export default class EncryptionPanel extends React.PureComponent {
         const request = this.props.verificationRequest || this.state.verificationRequest;
         const {member} = this.props;
         if (request) {
-            return <VerificationPanel request={request} />;
+            return <VerificationPanel request={request} key={request.channel.transactionId} />;
         } else if (member) {
             return <EncryptionInfo onStartVerification={this._onStartVerification} member={member} />;
         } else {