diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index e428bc42c6..7e2da08f95 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -421,7 +421,7 @@
         SELECT
             cg.id gridId,
             CONCAT(
-                ca.organization_name,
+                cu.organization_name,
                 "-",
                 cg.grid_name
             ) agencyGridName,
@@ -431,6 +431,7 @@
             IFNULL(cg.latitude, ca.latitude) latitude
         FROM
             customer_grid cg
+        INNER JOIN customer_agency cu ON cu.id = cg.pid AND cu.customer_id = cg.customer_id
         INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id
         WHERE
             cg.del_flag = '0'