diff --git a/app/Models/Note.php b/app/Models/Note.php
index 678e7a3f..efd9ee6d 100644
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@@ -456,7 +456,7 @@ class Note extends Model
             function ($matches) {
                 return '<a rel="tag" class="p-category" href="/notes/tagged/'
                 . Tag::normalize($matches[1]) . '">#'
-                . Tag::normalize($matches[1]) . '</a>';
+                . $matches[1] . '</a>';
             },
             $text
         );
diff --git a/database/seeds/NotesTableSeeder.php b/database/seeds/NotesTableSeeder.php
index 765bbc73..d9db1756 100644
--- a/database/seeds/NotesTableSeeder.php
+++ b/database/seeds/NotesTableSeeder.php
@@ -109,5 +109,9 @@ class NotesTableSeeder extends Seeder
         $mediaInstagram->type = 'image';
         $mediaInstagram->save();
         $noteFromInstagram->media()->save($mediaInstagram);
+        sleep(1);
+        $noteCapitalHashtag = Note::create([
+            'note' => 'A #TwoWord hashtag',
+        ]);
     }
 }