diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 1795913e49..4ee45c2034 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1052,15 +1052,15 @@ module.exports = React.createClass({
             }
 
             var topBar;
-            if (MatrixClientPeg.get().isGuest()) {
+            if (this.state.hasNewVersion) {
+                topBar = <NewVersionBar />;
+            }
+            else if (MatrixClientPeg.get().isGuest()) {
                 topBar = <GuestWarningBar />;
             }
             else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
                 topBar = <MatrixToolbar />;
             }
-            else if (this.state.hasNewVersion) {
-                topBar = <NewVersionBar />;
-            }
 
             var bodyClasses = "mx_MatrixChat";
             if (topBar) {