diff --git a/src/components/structures/auth/Login.tsx b/src/components/structures/auth/Login.tsx
index 9aca0046f2..ae791c2094 100644
--- a/src/components/structures/auth/Login.tsx
+++ b/src/components/structures/auth/Login.tsx
@@ -538,11 +538,12 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
                     </h1>
                     {errorTextSection}
                     {serverDeadSection}
-                    <ServerPicker
+                    {/*JP: Disable server info*/}
+{/*                    <ServerPicker
                         serverConfig={this.props.serverConfig}
                         onServerConfigChange={this.props.onServerConfigChange}
                         disabled={this.isBusy()}
-                    />
+                    />*/}
                     {this.renderLoginComponentForFlows()}
                     {footer}
                 </AuthBody>