diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index f2390b18..30158e3a 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -118,7 +118,7 @@ Page {
 						deviceVerificationList.add(flow.tranId);
 						break;
 				}
-				var dialog = deviceVerificationDialog.createObject(timelineRoot, {flow: flow,isRequest = isRequest});
+				var dialog = deviceVerificationDialog.createObject(timelineRoot, {flow: flow,isRequest: isRequest,tran_id: flow.tranId});
 				dialog.show();
 			}
 		}
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index 115a73c4..30d9c958 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -94,7 +94,7 @@ ApplicationWindow{
 					newFlow.userId = profile.userid;
 					newFlow.sender = true;
 					deviceVerificationList.add(newFlow.tranId);
-					var dialog = deviceVerificationDialog.createObject(userProfileDialog, {flow: newFlow,isRequest: true});
+					var dialog = deviceVerificationDialog.createObject(userProfileDialog, {flow: newFlow,isRequest: true,tran_id: newFlow.tranId});
 					dialog.show();
 				}
 			}
@@ -206,7 +206,7 @@ ApplicationWindow{
 										deviceVerificationList.updateProfile(newFlow.userId);
 									}else{
 										deviceVerificationList.add(newFlow.tranId);
-										var dialog = deviceVerificationDialog.createObject(userProfileDialog, {flow: newFlow,isRequest:false});
+										var dialog = deviceVerificationDialog.createObject(userProfileDialog, {flow: newFlow,isRequest:false,tran_id: newFlow.tranId});
 										dialog.show();
 									}
 								}
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index 94cb1e33..b5c53a4a 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -24,6 +24,7 @@ ApplicationWindow {
 
 	property var flow
 	property bool isRequest
+	property var tran_id
 
 	Connections {
 		target: flow
@@ -82,6 +83,7 @@ ApplicationWindow {
                         }
 						onClicked: { 
 							dialog.close(); 
+							deviceVerificationList.remove(tran_id);
 							delete flow; 
 						}
 					}
@@ -141,7 +143,7 @@ ApplicationWindow {
 						onClicked: { 
 							dialog.close();
 							flow.cancelVerification(DeviceVerificationFlow.User);
-							deviceVerificationList.remove(flow.tranId);
+							deviceVerificationList.remove(tran_id);
 						}
 					}
 					Item {
@@ -205,7 +207,7 @@ ApplicationWindow {
 						onClicked: { 
 							dialog.close(); 
 							flow.cancelVerification(DeviceVerificationFlow.User);
-							deviceVerificationList.remove(flow.tranId);
+							deviceVerificationList.remove(tran_id);
 						}
 					}
 					Item {
@@ -267,7 +269,7 @@ ApplicationWindow {
 						onClicked: { 
 							dialog.close(); 
 							flow.cancelVerification(DeviceVerificationFlow.MismatchedSAS);
-							deviceVerificationList.remove(flow.tranId);
+							deviceVerificationList.remove(tran_id);
 						}
 					}
 					Item {
@@ -426,7 +428,7 @@ ApplicationWindow {
 						onClicked: { 
 							dialog.close(); 
 							flow.cancelVerification(DeviceVerificationFlow.MismatchedSAS);
-							deviceVerificationList.remove(flow.tranId);
+							deviceVerificationList.remove(tran_id);
 						}
 					}
 					Item {
@@ -487,8 +489,7 @@ ApplicationWindow {
 						onClicked: { 
 							dialog.close(); 
 							flow.cancelVerification(DeviceVerificationFlow.User); 
-							deviceVerificationList.remove(flow.tranId);
-							delete flow;
+							deviceVerificationList.remove(tran_id);
 						}
 					}
 					Item {
@@ -534,7 +535,7 @@ ApplicationWindow {
                         }
 						onClicked: {
 							dialog.close()
-							deviceVerificationList.remove(flow.tranId);
+							deviceVerificationList.remove(tran_id);
 							delete flow;
 						}
 					}
@@ -578,7 +579,7 @@ ApplicationWindow {
                         }
 						onClicked: {
 							dialog.close();
-							deviceVerificationList.remove(flow.tranId);
+							deviceVerificationList.remove(tran_id);
 						}
 					}
 				}
@@ -622,7 +623,7 @@ ApplicationWindow {
 						text: qsTr("Close")
 						onClicked: {
 							dialog.close()
-							deviceVerificationList.remove(flow.tranId);
+							deviceVerificationList.remove(tran_id);
 							delete flow;
 						}
 					}