diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 53daa55fd8..892865fdf9 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -443,6 +443,7 @@ module.exports = React.createClass({
     _onClearCacheClicked: function() {
         if (!PlatformPeg.get()) return;
 
+        MatrixClientPeg.get().stopClient();
         MatrixClientPeg.get().store.deleteAllData().done(() => {
             PlatformPeg.get().reload();
         });