diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 5b3189f389..68a87d40b9 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -290,6 +290,7 @@ class Pill extends React.Component {
                     >
                         { avatar }
                         { linkText }
+                        { tip }
                     </a> :
                     <span
                         className={classes}
@@ -299,8 +300,8 @@ class Pill extends React.Component {
                     >
                         { avatar }
                         { linkText }
+                        { tip }
                     </span> }
-                {tip}
             </MatrixClientContext.Provider>;
         } else {
             // Deliberately render nothing if the URL isn't recognised