diff --git a/resources/assets/src/index.js b/resources/assets/src/index.js
index 7cc9137a..e6d342e8 100644
--- a/resources/assets/src/index.js
+++ b/resources/assets/src/index.js
@@ -12,8 +12,15 @@ async function loadI18n() {
     { lang: 'en', load: () => import('../../lang/en/front-end.yml') },
     { lang: 'zh_CN', load: () => import('../../lang/zh_CN/front-end.yml') },
   ]
-  const texts = await langs.find(({ lang }) => lang === blessing.locale).load()
-  blessing.i18n = Object.assign(blessing.i18n || Object.create(null), texts)
+  const texts = await langs.find(({ lang }) => lang === blessing.locale)
+  if (texts) {
+    blessing.i18n = Object.assign(blessing.i18n || Object.create(null), await texts.load())
+  } else {
+    blessing.i18n = Object.assign(
+      blessing.i18n || Object.create(null),
+      (await langs.find(({ lang }) => lang === blessing.fallback_locale)).load()
+    )
+  }
 }
 
 function loadModules() {
diff --git a/resources/views/common/dependencies/script.blade.php b/resources/views/common/dependencies/script.blade.php
index d6b4c999..00d06c05 100644
--- a/resources/views/common/dependencies/script.blade.php
+++ b/resources/views/common/dependencies/script.blade.php
@@ -1,18 +1,10 @@
-@if (file_exists(public_path($path = 'app/langs/'.config('app.locale').'.js')))
-    <script src="{{ url($path) }}"></script>
-    @if (file_exists(resource_path($path = 'lang/overrides/'.config('app.locale').'/locale.js')))
-        <script src="{{ url('resources/'.$path) }}"></script>
-    @endif
-@else
-    <script src="{{ url('app/langs/'.config('app.fallback_locale').'.js') }}"></script>
-    @if (file_exists(resource_path($path = 'lang/overrides/'.config('app.fallback_locale').'/locale.js')))
-        <script src="{{ url('resources/'.$path) }}"></script>
-    @endif
+@if (file_exists(resource_path($path = 'lang/overrides/'.config('app.locale').'/locale.js')))
+    <script src="{{ url('resources/'.$path) }}"></script>
+@endif
+@if (file_exists(resource_path($path = 'lang/overrides/'.config('app.fallback_locale').'/locale.js')))
+    <script src="{{ url('resources/'.$path) }}"></script>
 @endif
-
 <script src="{{ webpack_assets('index.js') }}"></script>
-
-<!-- User custom scripts -->
 <script>{!! option('custom_js') !!}</script>
 {{-- Content added by plugins dynamically --}}
 {!! bs_footer_extra() !!}