diff --git a/dependencies.gradle b/dependencies.gradle
index dcffb06da6..451ad4449b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -50,7 +50,7 @@ ext.libs = [
         androidx    : [
                 'activity'                : "androidx.activity:activity:1.4.0",
                 'appCompat'               : "androidx.appcompat:appcompat:1.4.2",
-                'core'                    : "androidx.core:core-ktx:1.7.0",
+                'core'                    : "androidx.core:core-ktx:1.8.0",
                 'recyclerview'            : "androidx.recyclerview:recyclerview:1.2.1",
                 'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.3",
                 'fragmentKtx'             : "androidx.fragment:fragment-ktx:1.4.1",
diff --git a/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
index 2f1b46b555..d91a09e6df 100644
--- a/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
@@ -26,7 +26,7 @@ import javax.inject.Inject
 class LocaleProvider @Inject constructor(private val resources: Resources) {
 
     fun current(): Locale {
-        return ConfigurationCompat.getLocales(resources.configuration)[0]
+        return ConfigurationCompat.getLocales(resources.configuration).get(0) ?: Locale.getDefault()
     }
 }