diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index ad77ed49a5..b35110bf6b 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -386,7 +386,11 @@ module.exports = createReactClass({
                 ...AutoDiscoveryUtils.authComponentStateForError(e),
             });
             if (this.state.serverErrorIsFatal) {
-                return; // Server is dead - do not continue.
+                // Server is dead: show server details prompt instead
+                this.setState({
+                    phase: PHASE_SERVER_DETAILS,
+                });
+                return;
             }
         }