diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index dc3158b39d..5f1e035e99 100644
--- a/res/css/structures/_HomePage.scss
+++ b/res/css/structures/_HomePage.scss
@@ -29,20 +29,3 @@ limitations under the License.
 	height: 100%;
 	border: 0px;
 }
-
-.mx_HomePage_body {
-//  margin-left: 63px;
-}
-
-.mx_HomePage_guest_warning {
-    display: flex;
-    background-color: $secondary-accent-color;
-    border: 1px solid $accent-color;
-    margin: 20px;
-    padding: 20px 40px;
-    border-radius: 5px;
-}
-
-.mx_HomePage_guest_warning img {
-    padding-right: 10px;
-}
diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js
index 948a07ee59..4deccb17dd 100644
--- a/src/components/structures/HomePage.js
+++ b/src/components/structures/HomePage.js
@@ -24,7 +24,6 @@ import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
 import sdk from '../../index';
 import { MatrixClient } from 'matrix-js-sdk';
-import dis from '../../dispatcher';
 
 class HomePage extends React.Component {
     static displayName = 'HomePage';
@@ -80,51 +79,10 @@ class HomePage extends React.Component {
         this._unmounted = true;
     }
 
-    onLoginClick(ev) {
-        ev.preventDefault();
-        ev.stopPropagation();
-        dis.dispatch({ action: 'start_login' });
-    }
-
-    onRegisterClick(ev) {
-        ev.preventDefault();
-        ev.stopPropagation();
-        dis.dispatch({ action: 'start_registration' });
-    }
-
     render() {
-        let guestWarning = "";
-        if (this.context.matrixClient.isGuest()) {
-            guestWarning = (
-                <div className="mx_HomePage_guest_warning">
-                    <img src={require("../../../res/img/warning.svg")} width="24" height="23" />
-                    <div>
-                        <div>
-                            { _t("You are currently using Riot anonymously as a guest.") }
-                        </div>
-                        <div>
-                            { _t(
-                                'If you would like to create a Matrix account you can <a>register</a> now.',
-                                {},
-                                { 'a': (sub) => <a href="#" onClick={this.onRegisterClick}>{ sub }</a> },
-                            ) }
-                        </div>
-                        <div>
-                            { _t(
-                                'If you already have a Matrix account you can <a>log in</a> instead.',
-                                {},
-                                { 'a': (sub) => <a href="#" onClick={this.onLoginClick}>{ sub }</a> },
-                            ) }
-                        </div>
-                    </div>
-                </div>
-            );
-        }
-
         if (this.state.iframeSrc) {
             return (
                 <div className="mx_HomePage">
-                    { guestWarning }
                     <iframe src={ this.state.iframeSrc } />
                 </div>
             );
@@ -132,7 +90,6 @@ class HomePage extends React.Component {
             const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
             return (
                 <GeminiScrollbarWrapper autoshow={true} className="mx_HomePage">
-                    { guestWarning }
                     <div className="mx_HomePage_body" dangerouslySetInnerHTML={{ __html: this.state.page }}>
                     </div>
                 </GeminiScrollbarWrapper>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7eccbc4fd1..8fe1b926f9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1277,8 +1277,6 @@
     "This homeserver does not support communities": "This homeserver does not support communities",
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",
     "Couldn't load home page": "Couldn't load home page",
-    "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
-    "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",
     "Invalid configuration: Cannot supply a default homeserver URL and a default server name": "Invalid configuration: Cannot supply a default homeserver URL and a default server name",
     "Failed to reject invitation": "Failed to reject invitation",
     "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",