diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js
index 88a25971d7a3f..b64707cc16ab8 100644
--- a/src/components/LocalePicker.js
+++ b/src/components/LocalePicker.js
@@ -79,7 +79,7 @@ export default compose(
     withLocalize,
     withOnyx({
         preferredLocale: {
-            key: ONYXKEYS.PREFERRED_LOCALE,
+            key: ONYXKEYS.NVP_PREFERRED_LOCALE,
         },
         betas: {
             key: ONYXKEYS.BETAS,
diff --git a/src/libs/actions/SignInRedirect.js b/src/libs/actions/SignInRedirect.js
index a206b5f249ac7..fec0dafc581c8 100644
--- a/src/libs/actions/SignInRedirect.js
+++ b/src/libs/actions/SignInRedirect.js
@@ -21,7 +21,7 @@ Onyx.connect({
 
 let currentPreferredLocale;
 Onyx.connect({
-    key: ONYXKEYS.PREFERRED_LOCALE,
+    key: ONYXKEYS.NVP_PREFERRED_LOCALE,
     callback: val => currentPreferredLocale = val,
 });
 
@@ -51,7 +51,7 @@ function redirectToSignIn(errorMessage) {
         .then(() => {
             Onyx.clear().then(() => {
                 if (preferredLocale) {
-                    Onyx.set(ONYXKEYS.PREFERRED_LOCALE, preferredLocale);
+                    Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, preferredLocale);
                 }
                 if (errorMessage) {
                     Onyx.set(ONYXKEYS.SESSION, {error: errorMessage});