diff --git a/Core b/Core
index c333c2206d..7b1f0c72c7 160000
--- a/Core
+++ b/Core
@@ -1 +1 @@
-Subproject commit c333c2206d0fa22ba1e580d837d8f4270022e03d
+Subproject commit 7b1f0c72c7031206b8161edd59a01e38c4edaac6
diff --git a/app/src/main/java/com/infomaniak/drive/data/cache/DriveInfosController.kt b/app/src/main/java/com/infomaniak/drive/data/cache/DriveInfosController.kt
index a71afc9822..b458f75257 100644
--- a/app/src/main/java/com/infomaniak/drive/data/cache/DriveInfosController.kt
+++ b/app/src/main/java/com/infomaniak/drive/data/cache/DriveInfosController.kt
@@ -40,7 +40,7 @@ object DriveInfosController {
         .modules(RealmModules.DriveFilesModule())
         .build()
 
-    fun getRealmInstance() = Realm.getInstance(realmConfiguration)
+    fun getRealmInstance(): Realm = Realm.getInstance(realmConfiguration)
 
     private fun ArrayList<Drive>.initDriveForRealm(
         drive: Drive,
diff --git a/app/src/main/java/com/infomaniak/drive/ui/LaunchActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/LaunchActivity.kt
index 08ef4f039d..ada6418a26 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/LaunchActivity.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/LaunchActivity.kt
@@ -128,11 +128,15 @@ class LaunchActivity : AppCompatActivity() {
             AccountUtils.updateCurrentUserAndDrives(this)
         }
 
-        val areAllDrivesInMaintenance = DriveInfosController.getDrives(userId = AccountUtils.currentUserId).all { it.maintenance }
+        val areAllDrivesInMaintenance = DriveInfosController.getDrives(userId = AccountUtils.currentUserId)
+            .takeUnless { it.isEmpty() }
+            ?.all { it.maintenance }
+            ?: false
 
-        return when {
-            areAllDrivesInMaintenance -> MaintenanceActivity::class.java
-            else -> MainActivity::class.java
+        return if (areAllDrivesInMaintenance) {
+            MaintenanceActivity::class.java
+        } else {
+            MainActivity::class.java
         }
     }
 
diff --git a/fastlane/metadata/android/fr/changelogs/5_03_003_01.txt b/fastlane/metadata/android/fr/changelogs/5_03_003_01.txt
index 14cb667c49..9abe5e4101 100644
--- a/fastlane/metadata/android/fr/changelogs/5_03_003_01.txt
+++ b/fastlane/metadata/android/fr/changelogs/5_03_003_01.txt
@@ -1 +1 @@
-- Correctement déconnecte l'utilisateur si son token expire
+- Déconnecte correctement l'utilisateur si son token expire