diff --git a/changelogs/client_server/newsfragments/2036.clarification b/changelogs/client_server/newsfragments/2036.clarification
new file mode 100644
index 000000000..96058b7b2
--- /dev/null
+++ b/changelogs/client_server/newsfragments/2036.clarification
@@ -0,0 +1 @@
+Clarify that ``FAIL_ERROR`` in autodiscovery is not limited to just homeservers.
diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst
index a8bbfca0e..4158bad87 100644
--- a/specification/client_server_api.rst
+++ b/specification/client_server_api.rst
@@ -289,7 +289,7 @@ In this section, the following terms are used with specific meanings:
 ``FAIL_ERROR``
   Inform the user that auto-discovery did not return any usable URLs. Do not
   continue further with the current login process. At this point, valid data
-  was obtained, but no homeserver is available to serve the client. No further
+  was obtained, but no server is available to serve the client. No further
   guess should be attempted and the user should make a conscientious decision
   what to do next.