diff --git a/app/src/main/java/org/tasks/injection/ApplicationModule.kt b/app/src/main/java/org/tasks/injection/ApplicationModule.kt
index 649d2b66e..2e04a8504 100644
--- a/app/src/main/java/org/tasks/injection/ApplicationModule.kt
+++ b/app/src/main/java/org/tasks/injection/ApplicationModule.kt
@@ -2,6 +2,7 @@ package org.tasks.injection
 
 import android.app.NotificationManager
 import android.content.Context
+import androidx.appcompat.app.AppCompatDelegate
 import com.todoroo.astrid.dao.Database
 import dagger.Module
 import dagger.Provides
@@ -24,9 +25,15 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 class ApplicationModule {
-
     @Provides
-    fun getLocale(): Locale = Locale.getDefault()
+    fun getLocale(): Locale {
+        return AppCompatDelegate.getApplicationLocales()
+            .toLanguageTags()
+            .split(",")
+            .firstOrNull()
+            ?.let { Locale.forLanguageTag(it) }
+            ?: Locale.getDefault()
+    }
 
     @Provides
     @Singleton
diff --git a/app/src/main/java/org/tasks/locale/LocalePickerDialog.kt b/app/src/main/java/org/tasks/locale/LocalePickerDialog.kt
index a12a7ee77..7f8137d91 100644
--- a/app/src/main/java/org/tasks/locale/LocalePickerDialog.kt
+++ b/app/src/main/java/org/tasks/locale/LocalePickerDialog.kt
@@ -4,41 +4,33 @@ import android.app.Activity
 import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.fragment.app.DialogFragment
 import dagger.hilt.android.AndroidEntryPoint
 import org.tasks.R
 import org.tasks.dialogs.DialogBuilder
 import org.xmlpull.v1.XmlPullParser
+import java.util.*
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class LocalePickerDialog : DialogFragment() {
     @Inject lateinit var dialogBuilder: DialogBuilder
+    @Inject lateinit var locale: Locale
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-
-        val locales = ArrayList<java.util.Locale>()
-        val selected =
-            AppCompatDelegate.getApplicationLocales().let { java.util.Locale.forLanguageTag(it.toLanguageTags()) }
-        val default = java.util.Locale.getDefault()
-        locales.add(default) // device locale
-        val tags = ArrayList<String>()
+        val locales = ArrayList<Locale>()
         val xrp = resources.getXml(R.xml.locales_config)
         var event = xrp.eventType
         while (event != XmlPullParser.END_DOCUMENT) {
             if (event == XmlPullParser.START_TAG && xrp.name == "locale") {
-                tags.add(xrp.getAttributeValue(0))
+                locales.add(Locale.forLanguageTag(xrp.getAttributeValue(0)))
             }
             event = xrp.next()
         }
-        for (override in tags) {
-            locales.add(java.util.Locale.forLanguageTag(override))
-        }
         val display = locales.map { it.getDisplayName(it) }
         return dialogBuilder
                 .newDialog()
-                .setSingleChoiceItems(display, display.indexOf(selected.getDisplayName(selected))) { dialog, which ->
+                .setSingleChoiceItems(display, display.indexOf(locale.getDisplayName(locale))) { dialog, which ->
                     val locale = locales[which].toLanguageTag()
                     val data = Intent().putExtra(EXTRA_LOCALE, locale)
                     dialog.dismiss()
diff --git a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt
index 936251dbe..d26ade4b6 100644
--- a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt
+++ b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt
@@ -61,6 +61,7 @@ class LookAndFeel : InjectingPreferenceFragment() {
     @Inject lateinit var localBroadcastManager: LocalBroadcastManager
     @Inject lateinit var defaultFilterProvider: DefaultFilterProvider
     @Inject lateinit var inventory: Inventory
+    @Inject lateinit var locale: Locale
 
     override fun getPreferenceXml() = R.xml.preferences_look_and_feel
 
@@ -98,8 +99,6 @@ class LookAndFeel : InjectingPreferenceFragment() {
         }
 
         val languagePreference = findPreference(R.string.p_language)
-        val locale =
-            Locale.forLanguageTag(AppCompatDelegate.getApplicationLocales().toLanguageTags())
         languagePreference.summary = locale.getDisplayName(locale)
         languagePreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
             val dialog = LocalePickerDialog.newLocalePickerDialog()