diff --git a/src/settingsview/components/LinkedDevices.qml b/src/settingsview/components/LinkedDevices.qml
index 242c422cb17dfc204c2217f4fd27a41170bcd101..8468219783e982b75f661336e43bf867a64a82e1 100644
--- a/src/settingsview/components/LinkedDevices.qml
+++ b/src/settingsview/components/LinkedDevices.qml
@@ -35,6 +35,7 @@ ColumnLayout {
 
     Connections {
         id: accountConnections_DeviceModel
+
         target: AccountAdapter.deviceModel
         enabled: root.visible
 
@@ -51,13 +52,26 @@ ColumnLayout {
         }
     }
 
+    Connections {
+        id: accountConnections
+
+        target: AccountAdapter
+        enabled: root.visible
+
+        function onAccountStatusChanged(id) {
+            if (SettingsAdapter.getAccountConfig_Manageruri() === ""){
+                linkDevPushButton.visible = SettingsAdapter.get_CurrentAccountInfo_Enabled()
+            }
+        }
+    }
+
     function connectCurrentAccount(status) {
         accountConnections_DeviceModel.enabled = status
     }
 
     function updateAndShowDevicesSlot() {
-        if(SettingsAdapter.getAccountConfig_Manageruri() === ""){
-            linkDevPushButton.visible = true
+        if (SettingsAdapter.getAccountConfig_Manageruri() === ""){
+            linkDevPushButton.visible = SettingsAdapter.get_CurrentAccountInfo_Enabled()
         }
         settingsListView.model.reset()
     }
@@ -145,8 +159,6 @@ ColumnLayout {
         Layout.preferredWidth: JamiTheme.preferredFieldWidth
         Layout.preferredHeight: JamiTheme.preferredFieldHeight
 
-        visible: SettingsAdapter.getAccountConfig_Manageruri() === ""
-
         color: JamiTheme.buttonTintedBlack
         hoveredColor: JamiTheme.buttonTintedBlackHovered
         pressedColor: JamiTheme.buttonTintedBlackPressed