diff --git a/src/fireedge/fireedge-server.conf b/src/fireedge/fireedge-server.conf
index 889eb6a63a..9e6e1e5447 100644
--- a/src/fireedge/fireedge-server.conf
+++ b/src/fireedge/fireedge-server.conf
@@ -44,7 +44,7 @@ oneprovision_optional_create_command: ''
 #   de_CH: 'German (Switzerland)'
 #   de: 'German'
 #   el_GR: 'Greek (Greece)'
-#   en_US: 'English'
+#   en: 'English'
 #   es_ES: 'Spanish'
 #   et_EE: 'Estonian'
 #   fa_IR: 'Persian (Iran)'
diff --git a/src/fireedge/src/client/components/HOC/Translate.js b/src/fireedge/src/client/components/HOC/Translate.js
index 9c153d11c5..dfe51f1886 100644
--- a/src/fireedge/src/client/components/HOC/Translate.js
+++ b/src/fireedge/src/client/components/HOC/Translate.js
@@ -78,7 +78,7 @@ const translate = (str = '', values) => {
   const context = useContext(TranslateContext)
   let key = str
 
-  if (context?.hash[key]) {
+  if (context?.hash?.[key]) {
     key = context.hash[key]
   }
 
diff --git a/src/fireedge/src/client/constants/index.js b/src/fireedge/src/client/constants/index.js
index 0da30d85c2..55fde4ad45 100644
--- a/src/fireedge/src/client/constants/index.js
+++ b/src/fireedge/src/client/constants/index.js
@@ -16,7 +16,7 @@
 import { defaultApps, defaultAppName } from 'server/utils/constants/defaults'
 
 export const JWT_NAME = 'FireedgeToken'
-export const DEFAULT_LANGUAGE = 'en_US'
+export const DEFAULT_LANGUAGE = 'en'
 
 export const BY = {
   text: 'OpenNebula',
diff --git a/src/fireedge/src/server/utils/constants/defaults.js b/src/fireedge/src/server/utils/constants/defaults.js
index 0f9f05a855..2d3a4b2602 100644
--- a/src/fireedge/src/server/utils/constants/defaults.js
+++ b/src/fireedge/src/server/utils/constants/defaults.js
@@ -116,7 +116,7 @@ const defaults = {
     de_CH: 'German (Switzerland)',
     de: 'German',
     el_GR: 'Greek (Greece)',
-    en_US: 'English',
+    en: 'English',
     es_ES: 'Spanish',
     et_EE: 'Estonian',
     fa_IR: 'Persian (Iran)',