diff --git a/src/components/status/status.js b/src/components/status/status.js
index 88ef9e40..5204fa73 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -335,7 +335,7 @@ const Status = {
             return
           }
         }
-        if (target.rel === 'tag') {
+        if (target.rel === 'tag' || target.className.match(/hashtag/)) {
           // Extract tag name from link url
           const tag = extractTagFromUrl(target.href)
           if (tag) {