diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9188fc85..f000644d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Add requirement on markdown external library for `gateway` extra package.
 
 ### Changed
+- gateway: Change error message when unable to parse agent info fields.
 - docs:
   - Update configuration reference documentation.
   - Update dashboard screenshot in overview page with example of resource chart.
diff --git a/slurmweb/apps/gateway.py b/slurmweb/apps/gateway.py
index 01e231b8..75ba0d9a 100644
--- a/slurmweb/apps/gateway.py
+++ b/slurmweb/apps/gateway.py
@@ -36,7 +36,7 @@ def from_json(cls, url, data):
             return cls(data["cluster"], data["infrastructure"], data["metrics"], url)
         except KeyError as err:
             raise SlurmwebAgentError(
-                "Unable to retrieve cluster name from agent"
+                "Unable to parse cluster info fields from agent"
             ) from err
 
 
diff --git a/slurmweb/tests/test_gateway.py b/slurmweb/tests/test_gateway.py
index 27c3d86d..f56ffa8a 100644
--- a/slurmweb/tests/test_gateway.py
+++ b/slurmweb/tests/test_gateway.py
@@ -97,8 +97,8 @@ def test_agents_missing_key(self, mock_requests_get):
             cm.output,
             [
                 "ERROR:slurmweb.apps.gateway:Unable to retrieve agent info from url "
-                "http://localhost: [SlurmwebAgentError] Unable to retrieve cluster "
-                "name from agent"
+                "http://localhost: [SlurmwebAgentError] Unable to parse cluster info "
+                "fields from agent"
             ],
         )