diff --git a/Riot/Modules/Settings/Security/SecurtiyViewController.m b/Riot/Modules/Settings/Security/SecurtiyViewController.m
index ea34b5e3d..da40082ec 100644
--- a/Riot/Modules/Settings/Security/SecurtiyViewController.m
+++ b/Riot/Modules/Settings/Security/SecurtiyViewController.m
@@ -366,10 +366,8 @@ UIDocumentInteractionControllerDelegate>
 - (void)loadDevices
 {
     // Refresh the account devices list
-    MXKAccount* account = [MXKAccountManager sharedManager].activeAccounts.firstObject;
-
     MXWeakify(self);
-    [account.mxRestClient devices:^(NSArray<MXDevice *> *devices) {
+    [self.mainSession.matrixRestClient devices:^(NSArray<MXDevice *> *devices) {
         MXStrongifyAndReturnIfNil(self);
 
         if (devices)
@@ -629,13 +627,6 @@ UIDocumentInteractionControllerDelegate>
     UITableViewCell *cell = [[UITableViewCell alloc] init];
     cell.backgroundColor = [UIColor redColor];
 
-    // check if there is a valid session
-    if (([AppDelegate theDelegate].mxSessions.count == 0) || ([MXKAccountManager sharedManager].activeAccounts.count == 0))
-    {
-        // else use a default cell
-        return cell;
-    }
-
     MXSession* session = self.mainSession;
     if (section == SETTINGS_SECTION_DEVICES_INDEX)
     {