diff --git a/libs/common/src/lib/helper.spec.ts b/libs/common/src/lib/helper.spec.ts
index 1f1be4edd2..d1130f0d75 100644
--- a/libs/common/src/lib/helper.spec.ts
+++ b/libs/common/src/lib/helper.spec.ts
@@ -134,11 +134,11 @@ describe('Helper', () => {
     });
 
     it('Invalid country code', () => {
-      expect(getEmojiFlag('XX')).toEqual('');
+      expect(getEmojiFlag('XX')).toEqual(undefined);
     });
 
     it('Empty country code', () => {
-      expect(getEmojiFlag('')).toEqual('');
+      expect(getEmojiFlag('')).toEqual(undefined);
     });
   });
 
diff --git a/libs/common/src/lib/helper.ts b/libs/common/src/lib/helper.ts
index 2dde25ad1c..4ed6b769f1 100644
--- a/libs/common/src/lib/helper.ts
+++ b/libs/common/src/lib/helper.ts
@@ -444,12 +444,12 @@ export function getEmojiFlag(aCountryCode: string) {
   const countryCode = aCountryCode?.toUpperCase();
 
   if (!countryCode || !VALID_COUNTRY_CODES.has(countryCode)) {
-    return '';
+    return undefined;
   }
 
-  return countryCode.replace(/./g, (character) =>
-    String.fromCodePoint(127397 + character.charCodeAt(0))
-  );
+  return countryCode.replace(/./g, (character) => {
+    return String.fromCodePoint(127397 + character.charCodeAt(0));
+  });
 }
 
 export function getLocale() {
diff --git a/libs/ui/src/lib/entity-logo/entity-logo.component.ts b/libs/ui/src/lib/entity-logo/entity-logo.component.ts
index bbfa57e229..8a788e0c80 100644
--- a/libs/ui/src/lib/entity-logo/entity-logo.component.ts
+++ b/libs/ui/src/lib/entity-logo/entity-logo.component.ts
@@ -27,7 +27,7 @@ export class GfEntityLogoComponent implements OnChanges {
   @Input() tooltip: string;
   @Input() url: string;
 
-  public emojiFlag = '';
+  public emojiFlag?: string;
   public hasError = false;
   public src?: string;
 
@@ -36,7 +36,7 @@ export class GfEntityLogoComponent implements OnChanges {
   ) {}
 
   public ngOnChanges() {
-    this.emojiFlag = '';
+    this.emojiFlag = undefined;
     this.hasError = false;
     this.src = undefined;