diff --git a/resources/assets/src/js/common/i18n.js b/resources/assets/src/js/common/i18n.js
index cba9553c..9a4aacba 100644
--- a/resources/assets/src/js/common/i18n.js
+++ b/resources/assets/src/js/common/i18n.js
@@ -1,7 +1,7 @@
 'use strict';
 
-$.locales       = {};
-$.currentLocale = {};
+$.locales       = Object.create(null);
+$.currentLocale = Object.create(null);
 
 /**
  * Load current selected language.
@@ -11,7 +11,7 @@ $.currentLocale = {};
 function loadLocales() {
     for (let lang in $.locales) {
         if (!isEmpty($.locales[lang])) {
-            $.currentLocale = $.locales[lang] || {};
+            $.currentLocale = $.locales[lang] || Object.create(null);
         }
     }
 }
diff --git a/resources/views/common/dependencies/script.tpl b/resources/views/common/dependencies/script.tpl
index a4840428..8f5d1ed0 100644
--- a/resources/views/common/dependencies/script.tpl
+++ b/resources/views/common/dependencies/script.tpl
@@ -1,5 +1,10 @@
 <script type="text/javascript" src="{{ assets('js/app.js') }}"></script>
-<script type="text/javascript" src="{{ assets('lang/'.config('app.locale').'/locale.js') }}"></script>
+
+@if (file_exists(resource_path('lang/'.config('app.locale').'/locale.js')))
+    <script type="text/javascript" src="{{ assets('lang/'.config('app.locale').'/locale.js') }}"></script>
+@else
+    <script type="text/javascript" src="{{ assets('lang/'.config('app.fallback_locale').'/locale.js') }}"></script>
+@endif
 
 @if (isset($module))
     <script type="text/javascript" src="{{ assets('js/'.$module.'.js') }}"></script>