diff --git a/docs/CHANGES.md b/docs/CHANGES.md
index 6f601af31..107b56194 100755
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
@@ -5,6 +5,7 @@
 - Enable new rooms to be configured automatically, with a default config, via `rooms.open`.
   For details, refer to the [relevant documentation](https://conversejs.org/docs/html/developer_api.html#the-rooms-grouping) [jcbrand]
 - Bugfix: Arrays in configuration settings were ignored. [jcbrand]
+- Bugfix: Chatboxes aren't closed when logging out. [jcbrand]
 
 ## 2.0.1 (2016-11-07)
 - #203 New configuration setting [muc_domain](https://conversejs.org/docs/html/configuration.html#muc_domain) [jcbrand]
diff --git a/src/converse-core.js b/src/converse-core.js
index d0daebacb..10777377a 100755
--- a/src/converse-core.js
+++ b/src/converse-core.js
@@ -534,6 +534,7 @@
         };
 
         this.logOut = function () {
+            converse.chatboxviews.closeAllChatBoxes();
             converse.disconnection_cause = converse.LOGOUT;
             if (typeof converse.connection !== 'undefined') {
                 converse.connection.disconnect();
@@ -541,7 +542,6 @@
             }
             converse.clearSession();
             converse._tearDown();
-            converse.chatboxviews.closeAllChatBoxes();
             converse.emit('logout');
         };