diff --git a/cnf/pom.xml b/cnf/pom.xml
index 32e92f67f8..e7f876f3d5 100644
--- a/cnf/pom.xml
+++ b/cnf/pom.xml
@@ -177,7 +177,7 @@
 			<!-- Release notes: https://github.com/jenetics/jenetics/blob/master/RELEASE_NOTES.md -->
 			<groupId>io.jenetics</groupId>
 			<artifactId>jenetics</artifactId>
-			<version>7.2.0</version>
+			<version>8.1.0</version>
 		</dependency>
 		<!-- javax -->
 		<dependency>
diff --git a/io.openems.wrapper/jenetics.bnd b/io.openems.wrapper/jenetics.bnd
index b8c7910d5e..0aeb498fda 100644
--- a/io.openems.wrapper/jenetics.bnd
+++ b/io.openems.wrapper/jenetics.bnd
@@ -2,9 +2,9 @@ Bundle-Name: Jenetics
 Bundle-Description: Java Genetic Algorithm Library
 Bundle-DocURL: https://github.com/dhatim/fastexcel
 Bundle-License: https://opensource.org/licenses/Apache-2.0
-Bundle-Version: 7.2.0
+Bundle-Version: 8.1.0
 
-Include-Resource: @jenetics-7.2.0.jar
+Include-Resource: @jenetics-8.1.0.jar
 
 -dsannotations: *
 
diff --git a/ui/src/app/shared/type/language.ts b/ui/src/app/shared/type/language.ts
index ac767f7efb..693a81d2b6 100644
--- a/ui/src/app/shared/type/language.ts
+++ b/ui/src/app/shared/type/language.ts
@@ -119,7 +119,7 @@ export class Language {
      * @returns translations params
      */
     public static async setAdditionalTranslationFile(translationFile: any, translate: TranslateService): Promise<{ lang: string; translations: {}; shouldMerge?: boolean; }> {
-        const lang = (await translate.onLangChange.pipe(filter(lang => !!lang), take(1)).toPromise()).lang ?? Language.DEFAULT.key;
+        const lang = (await translate.onLangChange.pipe(filter(lang => !!lang), take(1)).toPromise())?.lang ?? Language.DEFAULT.key;
         let translationKey: string = lang;
         if (!(lang in translationFile)) {