diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 9d930b143..e4967648f 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -7440,8 +7440,6 @@ static CGSize kThreadListBarButtonItemImageSize;
     MXWeakify(self);
     [self.threadsBetaBridgePresenter dismissWithAnimated:YES completion:^{
         MXStrongifyAndReturnIfNil(self);
-        RiotSettings.shared.enableThreads = YES;
-        MXSDKOptions.sharedInstance.enableThreads = YES;
         [self cancelEventSelection];
         [self.roomDataSource reload];
         [self openThreadWithId:coordinatorBridgePresenter.threadId];
diff --git a/Riot/Modules/Threads/Beta/ThreadsBetaCoordinator.swift b/Riot/Modules/Threads/Beta/ThreadsBetaCoordinator.swift
index 3a3c213d1..82369c268 100644
--- a/Riot/Modules/Threads/Beta/ThreadsBetaCoordinator.swift
+++ b/Riot/Modules/Threads/Beta/ThreadsBetaCoordinator.swift
@@ -30,6 +30,8 @@ final class ThreadsBetaCoordinator: NSObject, ThreadsBetaCoordinatorProtocol {
         let result = ThreadsBetaViewController.instantiate()
         result.didTapEnableButton = { [weak self] in
             guard let self = self else { return }
+            RiotSettings.shared.enableThreads = true
+            MXSDKOptions.sharedInstance().enableThreads = true
             self.delegate?.threadsBetaCoordinatorDidTapEnable(self)
         }
         result.didTapCancelButton = { [weak self] in