diff --git a/src/BasePlatform.js b/src/BasePlatform.js
index ffb32fce64..897a1a2dc8 100644
--- a/src/BasePlatform.js
+++ b/src/BasePlatform.js
@@ -71,6 +71,6 @@ export default class BasePlatform {
      * the current version of the application.
      */
     getAppVersion() {
-        return q();
+        throw new Error("getAppVersion not implemented!");
     }
 }
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b69793c539..c139999748 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -36,7 +36,6 @@ module.exports = React.createClass({
     displayName: 'UserSettings',
 
     propTypes: {
-        version: React.PropTypes.string,
         onClose: React.PropTypes.func,
         // The brand string given when creating email pushers
         brand: React.PropTypes.string,
@@ -66,8 +65,11 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
+        this._unmounted = false;
+
         if (PlatformPeg.get()) {
             PlatformPeg.get().getAppVersion().done((appVersion) => {
+                if (this._unmounted) return;
                 this.setState({
                     vectorVersion: appVersion,
                 });
@@ -90,6 +92,7 @@ module.exports = React.createClass({
     },
 
     componentWillUnmount: function() {
+        this._unmounted = true;
         dis.dispatch({
             action: 'ui_opacity',
             sideOpacity: 1.0,