diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 6fe64d3ee..6043a537d 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -161,6 +161,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
 		const combinedTokens = tokens.concat(cwTokens);
 
 		tags = data.apHashtags || extractHashtags(combinedTokens);
+		tags = tags.filter(tag => tag.length <= 100);
 
 		emojis = data.apEmojis || extractEmojis(combinedTokens);
 
@@ -467,9 +468,7 @@ function extractHashtags(tokens: ReturnType<typeof parse>): string[] {
 
 	const extract = (tokens: Node[]) => {
 		tokens.filter(x => x.name === 'hashtag').forEach(x => {
-			if (x.props.hashtag.length <= 100) {
-				hashtags.push(x.props.hashtag);
-			}
+			hashtags.push(x.props.hashtag);
 		});
 		tokens.filter(x => x.children).forEach(x => {
 			extract(x.children);