diff --git a/src/components/structures/auth/Login.tsx b/src/components/structures/auth/Login.tsx
index e4ac7f88ce..7e3eabb123 100644
--- a/src/components/structures/auth/Login.tsx
+++ b/src/components/structures/auth/Login.tsx
@@ -392,19 +392,17 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
                     // look for a flow where we understand all of the steps.
                     const supportedFlows = flows.filter(this.isSupportedFlow);
 
-                    if (supportedFlows.length > 0) {
-                        this.setState({
-                            flows: supportedFlows,
-                        });
-                        return;
-                    }
-
-                    // we got to the end of the list without finding a suitable flow.
                     this.setState({
-                        errorText: _t(
-                            "This homeserver doesn't offer any login flows which are supported by this client.",
-                        ),
+                        flows: supportedFlows,
                     });
+
+                    if (supportedFlows.length === 0) {
+                        this.setState({
+                            errorText: _t(
+                                "This homeserver doesn't offer any login flows that are supported by this client.",
+                            ),
+                        });
+                    }
                 },
                 (err) => {
                     this.setState({
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0fa5a5abd4..d2e280ff13 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -3569,7 +3569,7 @@
     "General failure": "General failure",
     "This homeserver does not support login using email address.": "This homeserver does not support login using email address.",
     "Failed to perform homeserver discovery": "Failed to perform homeserver discovery",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "This homeserver doesn't offer any login flows which are supported by this client.",
+    "This homeserver doesn't offer any login flows that are supported by this client.": "This homeserver doesn't offer any login flows that are supported by this client.",
     "Syncing…": "Syncing…",
     "Signing In…": "Signing In…",
     "If you've joined lots of rooms, this might take a while": "If you've joined lots of rooms, this might take a while",
diff --git a/test/components/structures/auth/Login-test.tsx b/test/components/structures/auth/Login-test.tsx
index 148829eb2a..62e5408430 100644
--- a/test/components/structures/auth/Login-test.tsx
+++ b/test/components/structures/auth/Login-test.tsx
@@ -216,6 +216,38 @@ describe("Login", function () {
         expect(platform.startSingleSignOn.mock.calls[1][0].baseUrl).toBe("https://server2");
     });
 
+    it("should handle updating to a server with no supported flows", async () => {
+        mockClient.loginFlows.mockResolvedValue({
+            flows: [
+                {
+                    type: "m.login.sso",
+                },
+            ],
+        });
+
+        const { container, rerender } = render(getRawComponent());
+        await waitForElementToBeRemoved(() => screen.queryAllByLabelText("Loading…"));
+
+        // update the mock for the new server with no supported flows
+        mockClient.loginFlows.mockResolvedValue({
+            flows: [
+                {
+                    type: "just something weird",
+                },
+            ],
+        });
+        // render with a new server
+        rerender(getRawComponent("https://server2"));
+        await waitForElementToBeRemoved(() => screen.queryAllByLabelText("Loading…"));
+
+        expect(
+            screen.getByText("This homeserver doesn't offer any login flows that are supported by this client."),
+        ).toBeInTheDocument();
+
+        // no sso button because server2 doesnt support sso
+        expect(container.querySelector(".mx_SSOButton")).not.toBeInTheDocument();
+    });
+
     it("should show single Continue button if OIDC MSC3824 compatibility is given by server", async () => {
         mockClient.loginFlows.mockResolvedValue({
             flows: [
@@ -289,7 +321,7 @@ describe("Login", function () {
         await waitForElementToBeRemoved(() => screen.queryAllByLabelText("Loading…"));
 
         expect(
-            screen.getByText("This homeserver doesn't offer any login flows which are supported by this client."),
+            screen.getByText("This homeserver doesn't offer any login flows that are supported by this client."),
         ).toBeInTheDocument();
     });