diff --git a/handler.py b/handler.py
index 20a50bd..2be0414 100644
--- a/handler.py
+++ b/handler.py
@@ -406,6 +406,7 @@ def get_affected_entities(health_client, event_arn, affected_accounts, is_org_mo
     affected_entity_array = []
 
     for account in affected_accounts:
+        account_name = ""
         if is_org_mode:
             event_entities_paginator = health_client.get_paginator(
                 "describe_affected_entities_for_organization"
@@ -415,6 +416,7 @@ def get_affected_entities(health_client, event_arn, affected_accounts, is_org_mo
                     {"awsAccountId": account, "eventArn": event_arn}
                 ]
             )
+            account_name = get_account_name(account)
         else:
             event_entities_paginator = health_client.get_paginator(
                 "describe_affected_entities"
@@ -433,7 +435,7 @@ def get_affected_entities(health_client, event_arn, affected_accounts, is_org_mo
                 entity.pop("eventArn")  # remove eventArn duplicate of detail.arn
                 entity.pop("lastUpdatedTime")  # remove for brevity
                 if is_org_mode:
-                    entity["awsAccountName"] = get_account_name(entity["awsAccountId"])
+                    entity["awsAccountName"] = account_name
                 affected_entity_array.append(entity)
 
     return affected_entity_array