diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index c24502e7e1..42eab24051 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -58,12 +58,16 @@ limitations under the License.
 .mx_EventTile .mx_SenderProfile .mx_Flair {
     opacity: 0.7;
     margin-left: 5px;
-}
+    display: inline-block;
+    vertical-align: top;
+    height: 16px;
+    overflow: hidden;
 
-.mx_EventTile .mx_SenderProfile .mx_Flair img {
-    vertical-align: -2px;
-    margin-right: 2px;
-    border-radius: 8px;
+    img {
+        vertical-align: -2px;
+        margin-right: 2px;
+        border-radius: 8px;
+    }
 }
 
 .mx_EventTile .mx_MessageTimestamp {
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 76566e8c4d..aa629794ba 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -117,7 +117,7 @@ export default class Flair extends React.Component {
 
     render() {
         if (this.state.profiles.length === 0) {
-            return <div />;
+            return <span className="mx_Flair" />;
         }
         const avatars = this.state.profiles.map((profile, index) => {
             return <FlairAvatar key={index} groupProfile={profile} />;