diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 89bb0a8605..dbb75a2879 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -64,6 +64,7 @@ const TagPanel = React.createClass({
             Promise.all(orderedGroupTags.map(
                 (groupId) => FlairStore.getGroupProfileCached(this.context.matrixClient, groupId),
             )).then((orderedGroupTagProfiles) => {
+                if (this.unmounted) return;
                 this.setState({orderedGroupTagProfiles});
             });
         });