diff --git a/src/translator.ts b/src/translator.ts
index becb0096..cced9b7a 100644
--- a/src/translator.ts
+++ b/src/translator.ts
@@ -224,9 +224,7 @@ export class SCThingTranslator {
    */
   public translatedPropertyNames<T extends SCThing>(type: SCThingType,
                                                     language?: keyof SCTranslations<T>): T | undefined {
-    const targetLanguage = (typeof language !== 'undefined') ? language : this.language;
-
-    return this.getAllMetaFieldTranslations(type, targetLanguage) as T;
+    return this.getAllMetaFieldTranslations(type, language ?? this.language) as T;
   }
 
   /**
@@ -246,7 +244,7 @@ export class SCThingTranslator {
                                                     language?: keyof SCTranslations<T>): string | undefined {
     const fieldTranslation = this.getMetaClassInstance(type).fieldValueTranslations[language ?? this.language]?.[field];
 
-    return fieldTranslation?.[key ?? '']  ?? fieldTranslation ?? key;
+    return fieldTranslation?.[key ?? '']  ?? key ?? fieldTranslation;
   }
 
   /**