diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index c3467355bd..8fdcf15e1b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -191,7 +191,8 @@ module.exports = React.createClass({
             MatrixClientPeg.opts.initialSyncLimit = this.props.config.sync_timeline_limit;
         }
 
-        // Persist the team token across refreshes
+        // Persist the team token across refreshes using sessionStorage. A new window or
+        // tab will not persist sessionStorage, but refreshes will.
         if (this.props.startingFragmentQueryParams.team_token) {
             window.sessionStorage.setItem(
                 'mx_team_token',