diff --git a/gulpfile.ts b/gulpfile.ts
index 1c5516801a..5ae2652c62 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -149,6 +149,7 @@ const aliasifyConfig = {
 		'chart.js': './node_modules/chart.js/src/chart.js',
 		'textarea-caret-position': './node_modules/textarea-caret/index.js',
 		'misskey-text': './src/common/text/index.js',
+		'nyaize': './node_modules/nyaize/built/index.js',
 		'strength.js': './node_modules/syuilo-password-strength/strength.js',
 		'cropper': './node_modules/cropperjs/dist/cropper.js',
 		'Sortable': './node_modules/sortablejs/Sortable.js',
diff --git a/package.json b/package.json
index 5c75030774..360025749f 100644
--- a/package.json
+++ b/package.json
@@ -102,6 +102,7 @@
     "ms": "0.7.2",
     "multer": "1.2.1",
     "nprogress": "0.2.0",
+    "nyaize": "0.0.2",
     "page": "1.7.1",
     "prominence": "0.2.0",
     "pug": "2.0.0-beta6",
diff --git a/src/web/app/common/scripts/text-compiler.js b/src/web/app/common/scripts/text-compiler.js
index f6c531c6ce..8ea2361b87 100644
--- a/src/web/app/common/scripts/text-compiler.js
+++ b/src/web/app/common/scripts/text-compiler.js
@@ -1,4 +1,5 @@
 const riot = require('riot');
+const nyaize = require('nyaize').default;
 
 module.exports = function(tokens, shouldBreak, escape) {
 	if (shouldBreak == null) {
@@ -34,10 +35,7 @@ module.exports = function(tokens, shouldBreak, escape) {
 	}).join('');
 
 	if (me && me.data && me.data.nya) {
-		text = text.replace(/な/g, 'にゃ')
-			.replace(/ニャ/g, 'にゃ')
-			.replace(/にゃでにゃで/g, 'なでなで')
-			.replace(/ニャデニャデ/g, 'ナデナデ');
+		text = nyaize(text);
 	}
 
 	return text;