diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
index 099d358d2..146fa084d 100644
--- a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
@@ -34,7 +34,7 @@
 #import "MXKSendReplyEventStringLocalizer.h"
 #import "MXKSlashCommands.h"
 
-const BOOL USE_THREAD_TIMELINE = NO;
+const BOOL USE_THREAD_TIMELINE = YES;
 
 #pragma mark - Constant definitions
 
diff --git a/changelog.d/5629.change b/changelog.d/5629.change
new file mode 100644
index 000000000..d0d508b60
--- /dev/null
+++ b/changelog.d/5629.change
@@ -0,0 +1 @@
+MXKRoomDataSource: Enable usage of thread timelines.