diff --git a/Riot/Model/RoomList/RecentsDataSource.m b/Riot/Model/RoomList/RecentsDataSource.m
index c3d702b76..c6ef84a8c 100644
--- a/Riot/Model/RoomList/RecentsDataSource.m
+++ b/Riot/Model/RoomList/RecentsDataSource.m
@@ -95,9 +95,12 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
 
 - (void)setDelegate:(id<MXKDataSourceDelegate>)delegate andRecentsDataSourceMode:(RecentsDataSourceMode)recentsDataSourceMode
 {
-    self.delegate = delegate;
-    
-    self.recentsDataSourceMode = recentsDataSourceMode;
+    if (self.delegate != delegate || _recentsDataSourceMode != recentsDataSourceMode)
+    {
+        // Update the configuration, the recentsDataSourceMode setter will force a refresh.
+        self.delegate = delegate;
+        self.recentsDataSourceMode = recentsDataSourceMode;
+    }
 }
 
 - (void)setRecentsDataSourceMode:(RecentsDataSourceMode)recentsDataSourceMode