diff --git a/lib/charms/mysql/v0/mysql.py b/lib/charms/mysql/v0/mysql.py
index e7407d21f0..f002baab28 100644
--- a/lib/charms/mysql/v0/mysql.py
+++ b/lib/charms/mysql/v0/mysql.py
@@ -127,7 +127,7 @@ def wait_until_mysql_connection(self) -> None:
 # Increment this major API version when introducing breaking changes
 LIBAPI = 0
 
-LIBPATCH = 92
+LIBPATCH = 93
 
 UNIT_TEARDOWN_LOCKNAME = "unit-teardown"
 UNIT_ADD_LOCKNAME = "unit-add"
@@ -874,7 +874,11 @@ def get_cluster_endpoints(self, relation_name: str) -> tuple[str, str, str]:
             if v["status"] == MySQLMemberState.RECOVERING:
                 continue
 
-            address = f"{self.get_unit_address(unit_labels[k], relation_name)}:3306"
+            # skip if unit not available in unit_labels
+            if unit_label := unit_labels.get(k):
+                address = f"{self.get_unit_address(unit_label, relation_name)}:3306"
+            else:
+                continue
 
             if v["status"] != MySQLMemberState.ONLINE:
                 no_endpoints.add(address)