diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index d65e7ece5..989ed7b95 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -2413,6 +2413,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                     isLaunching = YES;
                     break;
                 case MXSessionStateStoreDataReady:
+                case MXSessionStateProcessingBackgroundSyncCache:
                 case MXSessionStateSyncInProgress:
                     // Stay in launching during the first server sync if the store is empty.
                     isLaunching = (mainSession.rooms.count == 0 && launchAnimationContainerView);
diff --git a/changelog.d/5472.bugfix b/changelog.d/5472.bugfix
new file mode 100644
index 000000000..605cec44d
--- /dev/null
+++ b/changelog.d/5472.bugfix
@@ -0,0 +1 @@
+Green launch spinner is sometimes dismissed too early causing the incorrect onboarding screen to be displayed.