diff --git a/Riot/Modules/Settings/Security/SecurityViewController.m b/Riot/Modules/Settings/Security/SecurityViewController.m
index 8c175c21b..c2561b36a 100644
--- a/Riot/Modules/Settings/Security/SecurityViewController.m
+++ b/Riot/Modules/Settings/Security/SecurityViewController.m
@@ -220,6 +220,8 @@ UIDocumentInteractionControllerDelegate>
 
     // Refresh devices in parallel
     [self loadDevices];
+    
+    [self loadCrossSigning];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -398,6 +400,20 @@ UIDocumentInteractionControllerDelegate>
 
 #pragma mark - Cross-signing
 
+- (void)loadCrossSigning
+{
+    MXCrossSigning *crossSigning = self.mainSession.crypto.crossSigning;
+    
+    [crossSigning refreshStateWithSuccess:^(BOOL stateUpdated) {
+        if (stateUpdated)
+        {
+            [self reloadData];
+        }
+    } failure:^(NSError * _Nonnull error) {
+        NSLog(@"[SecurityVC] loadCrossSigning: Cannot refresh cross-signing state. Error: %@", error);
+    }];
+}
+
 - (NSInteger)numberOfRowsInCrossSigningSection
 {
     NSInteger numberOfRowsInCrossSigningSection;