diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m
index 4220411d2..7f38a4465 100644
--- a/Riot/AppDelegate.m
+++ b/Riot/AppDelegate.m
@@ -310,6 +310,22 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
 
 #pragma mark - UIApplicationDelegate
 
+- (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(nullable NSDictionary *)launchOptions
+{
+    // Set the App Group identifier.
+    MXSDKOptions *sdkOptions = [MXSDKOptions sharedInstance];
+    sdkOptions.applicationGroupIdentifier = @"group.im.vector";
+    
+    // Redirect NSLogs to files only if we are not debugging
+    if (!isatty(STDERR_FILENO)) {
+        [MXLogger redirectNSLogToFiles:YES];
+    }
+
+    NSLog(@"[AppDelegate] willFinishLaunchingWithOptions");
+    
+    return YES;
+}
+
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
 #ifdef DEBUG
diff --git a/Riot/main.m b/Riot/main.m
index e2352ac8a..ed8089097 100644
--- a/Riot/main.m
+++ b/Riot/main.m
@@ -17,20 +17,8 @@
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 
-#import <MXLogger.h>
-
 int main(int argc, char * argv[]) {
     @autoreleasepool {
-
-        // Set the App Group identifier.
-        MXSDKOptions *sdkOptions = [MXSDKOptions sharedInstance];
-        sdkOptions.applicationGroupIdentifier = @"group.im.vector";
-
-        // Redirect NSLogs to files only if we are not debugging
-        if (!isatty(STDERR_FILENO)) {
-            [MXLogger redirectNSLogToFiles:YES];
-        }
-
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
     }
 }