diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index 466ac01dd0..393b7aa59d 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -137,6 +137,7 @@ export default class SetIdServer extends React.Component {
         let newFormValue = this.state.idServer;
         if (!errStr) {
             MatrixClientPeg.get().setIdentityServerUrl(fullUrl);
+            localStorage.removeItem("mx_is_access_token", fullUrl);
             localStorage.setItem("mx_is_url", fullUrl);
             newFormValue = '';
         }