diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index f42c752bb9..f916e28024 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -256,7 +256,7 @@ export default React.createClass({
                                     releaseNotes={this.props.newVersionReleaseNotes}
             />;
         } else if (this.props.checkingForUpdate) {
-            topBar = <UpdateCheckBar />;
+            topBar = <UpdateCheckBar {...this.props.checkingForUpdate} />;
         } else if (this.props.matrixClient.isGuest()) {
             topBar = <GuestWarningBar />;
         } else if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 706f7d35dd..6294201e13 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -127,7 +127,7 @@ module.exports = React.createClass({
             newVersion: null,
             hasNewVersion: false,
             newVersionReleaseNotes: null,
-            checkingForUpdate: false,
+            checkingForUpdate: null,
 
             // The username to default to when upgrading an account from a guest
             upgradeUsername: null,
@@ -1111,7 +1111,7 @@ module.exports = React.createClass({
             newVersion: latest,
             hasNewVersion: current !== latest,
             newVersionReleaseNotes: releaseNotes,
-            checkingForUpdate: false,
+            checkingForUpdate: null,
         });
     },
 
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 5af1ed42c6..a2d9df4900 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -854,20 +854,13 @@ module.exports = React.createClass({
         </div>;
     },
 
-    _onCheckUpdates: function() {
-        dis.dispatch({
-            action: 'check_updates',
-            value: true,
-        });
-    },
-
     _renderCheckUpdate: function() {
         const platform = PlatformPeg.get();
-        if ('canSelfUpdate' in platform && platform.canSelfUpdate()) {
+        if ('canSelfUpdate' in platform && platform.canSelfUpdate() && 'startUpdateCheck' in platform) {
             return <div>
                 <h3>{_t('Updates')}</h3>
                 <div className="mx_UserSettings_section">
-                    <AccessibleButton className="mx_UserSettings_button" onClick={this._onCheckUpdates}>
+                    <AccessibleButton className="mx_UserSettings_button" onClick={platform.startUpdateCheck}>
                         {_t('Check for update')}
                     </AccessibleButton>
                 </div>