diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index f574fc6e4..663246dff 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -2196,6 +2196,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     // Logout all matrix account
     [[MXKAccountManager sharedManager] logoutWithCompletion:^{
         
+        // We reset allChatsOnboardingHasBeenDisplayed flag on logout
+        RiotSettings.shared.allChatsOnboardingHasBeenDisplayed = NO;
+        
         if (completion)
         {
             completion (YES);
diff --git a/changelog.d/6676.change b/changelog.d/6676.change
new file mode 100644
index 000000000..bb8b3e164
--- /dev/null
+++ b/changelog.d/6676.change
@@ -0,0 +1 @@
+Reset allChatsOnboardingHasBeenDisplayed on logout