diff --git a/framework/core/src/Support/ClientAction.php b/framework/core/src/Support/ClientAction.php index 40f110ea8..1a3f44340 100644 --- a/framework/core/src/Support/ClientAction.php +++ b/framework/core/src/Support/ClientAction.php @@ -248,7 +248,11 @@ abstract class ClientAction extends HtmlAction } if (! $locale || ! $this->locales->hasLocale($locale)) { - return $this->settings->get('default_locale', 'en'); + $locale = $this->settings->get('default_locale', 'en'); + } + + if (! $this->locales->hasLocale($locale)) { + return 'en'; } return $locale;