diff --git a/Riot/Modules/TabBar/MasterTabBarController.m b/Riot/Modules/TabBar/MasterTabBarController.m
index e49c97545f..3cb77fcec2 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.m
+++ b/Riot/Modules/TabBar/MasterTabBarController.m
@@ -557,10 +557,11 @@ - (void)showOnboardingFlow
     MXLogDebug(@"[MasterTabBarController] showAuthenticationScreen");
     
     // Check whether an authentication screen is not already shown or preparing
-    if (!self.onboardingCoordinatorBridgePresenter && !self.isOnboardingCoordinatorPreparing)
-    {
-        self.isOnboardingCoordinatorPreparing = YES;
-        self.isOnboardingInProgress = YES;
+    // Tchap: Disable Onboarding.
+//    if (!self.onboardingCoordinatorBridgePresenter && !self.isOnboardingCoordinatorPreparing)
+//    {
+//        self.isOnboardingCoordinatorPreparing = YES;
+//        self.isOnboardingInProgress = YES;
         
         [self resetReviewSessionsFlags];
         
@@ -569,7 +570,7 @@ - (void)showOnboardingFlow
 //            [self presentOnboardingFlow];
             [self.masterTabBarDelegate masterTabBarControllerShouldShowAuthenticationFlow:self];
         }];
-    }
+//    }
 }
 
 /**
diff --git a/changelog.d/489.bugfix b/changelog.d/489.bugfix
new file mode 100644
index 0000000000..bba1bcc960
--- /dev/null
+++ b/changelog.d/489.bugfix
@@ -0,0 +1 @@
+Infinite loading wheel on logout