diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
index a69f504cc0..033aa93618 100644
--- a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
@@ -456,11 +456,6 @@ - (void)limitMemoryUsage:(NSInteger)maxBubbleNb
 }
 
 - (void)reset
-{
-    [self resetNotifying:YES];
-}
-
-- (void)resetNotifying:(BOOL)notify
 {
     if (roomDidFlushDataNotificationObserver)
     {
@@ -556,12 +551,6 @@ - (void)resetNotifying:(BOOL)notify
     }
     
     _serverSyncEventCount = 0;
-
-    // Notify the delegate to reload its tableview
-    if (notify && self.delegate)
-    {
-        [self.delegate dataSource:self didCellChange:nil];
-    }
 }
 
 - (void)reload
@@ -575,10 +564,16 @@ - (void)reloadNotifying:(BOOL)notify
     
     [self setState:MXKDataSourceStatePreparing];
     
-    [self resetNotifying:notify];
+    [self reset];
     
     // Reload
     [self didMXSessionStateChange];
+    
+    // Notify the delegate to refresh the tableview
+    if (notify && self.delegate)
+    {
+        [self.delegate dataSource:self didCellChange:nil];
+    }
 }
 
 - (void)destroy
diff --git a/changelog.d/7523.bugfix b/changelog.d/7523.bugfix
new file mode 100644
index 0000000000..bc5cf31a71
--- /dev/null
+++ b/changelog.d/7523.bugfix
@@ -0,0 +1 @@
+Fix a flickering issue when the timeline datasource is reloaded.