diff --git a/src/settingsview/components/LinkDeviceDialog.qml b/src/settingsview/components/LinkDeviceDialog.qml
index 4639cd904cdbf9d29732584de98a66efc3b1f760..3e1523450cdf9d0c2d58311809e1988af79dfeca 100644
--- a/src/settingsview/components/LinkDeviceDialog.qml
+++ b/src/settingsview/components/LinkDeviceDialog.qml
@@ -53,11 +53,6 @@ BaseDialog {
         timerForExport.restart()
     }
 
-    function slotExportOnRing(){
-        AccountAdapter.model.exportOnRing(AccountAdapter.currentAccountId,
-                                          passwordEdit.text)
-    }
-
     Timer{
         id: timerForExport
 
@@ -65,24 +60,12 @@ BaseDialog {
         interval: 200
 
         onTriggered: {
-            timeOut.restart()
-            slotExportOnRing()
-        }
-    }
-
-    Timer {
-        id: timeOut
-
-        repeat: false
-        interval: exportTimeout
-
-        onTriggered: {
-            setExportPage(NameDirectory.ExportOnRingStatus.NETWORK_ERROR, "")
+            AccountAdapter.model.exportOnRing(AccountAdapter.currentAccountId,
+                                              passwordEdit.text)
         }
     }
 
     function setExportPage(status, pin) {
-        timeOut.stop()
 
         if (status === NameDirectory.ExportOnRingStatus.SUCCESS) {
             infoLabel.success = true
@@ -115,8 +98,6 @@ BaseDialog {
 
     signal accepted
 
-    property int exportTimeout : 20000
-
     title: JamiStrings.addDevice
 
     Connections {