diff --git a/app/logical/sources/strategies/twitter.rb b/app/logical/sources/strategies/twitter.rb
index f5722f6b7..a90d260a6 100644
--- a/app/logical/sources/strategies/twitter.rb
+++ b/app/logical/sources/strategies/twitter.rb
@@ -20,7 +20,7 @@ module Sources::Strategies
     # The regexes will not match if there is nothing preceding
     # the pattern to avoid creating empty strings.
     COMMON_TAG_REGEXES = [
-      /(?<!\A)生誕祭(?:\d+)?\z/,
+      /(?<!\A)生誕祭(?:\d*)\z/,
       /(?<!\A)版もうひとつの深夜の真剣お絵描き60分一本勝負(?:_\d+)?\z/,
       /(?<!\A)版深夜の真剣お絵描き60分一本勝負(?:_\d+)?\z/,
       /(?<!\A)深夜の真剣お絵描き60分一本勝負(?:_\d+)?\z/,
diff --git a/test/unit/sources/twitter_test.rb b/test/unit/sources/twitter_test.rb
index 381967fd3..c8362563c 100644
--- a/test/unit/sources/twitter_test.rb
+++ b/test/unit/sources/twitter_test.rb
@@ -259,5 +259,20 @@ module Sources
         assert_nil(site.image_url)
       end
     end
+
+    context "A tweet with hashtags" do
+      should "ignore common suffixes when translating hashtags" do
+        as(create(:user)) do
+          create(:tag, name: "nishizumi_miho", post_count: 1)
+          create(:wiki_page, title: "nishizumi_miho", other_names: "西住みほ")
+        end
+
+        site = Sources::Strategies.find("https://twitter.com/kasaishin100/status/1186658635226607616")
+
+        assert_includes(site.tags.map(&:first), "西住みほ生誕祭2019")
+        assert_includes(site.normalized_tags, "西住みほ")
+        assert_includes(site.translated_tags.map(&:name), "nishizumi_miho")
+      end
+    end
   end
 end