diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index cd0acd92f8..9abea0d202 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -187,6 +187,9 @@ Flair.propTypes = {
     userId: PropTypes.string,
 };
 
+// TODO: We've decided that all components should follow this pattern, which means removing withMatrixClient and using
+// this.context.matrixClient everywhere instead of this.props.matrixClient.
+// See https://github.com/vector-im/riot-web/issues/4951.
 Flair.contextTypes = {
     matrixClient: React.PropTypes.instanceOf(MatrixClient).isRequired,
 };