diff --git a/app/chewy/accounts_index.rb b/app/chewy/accounts_index.rb
index 59f2f991f2bda0..2d03611acdb223 100644
--- a/app/chewy/accounts_index.rb
+++ b/app/chewy/accounts_index.rb
@@ -23,7 +23,10 @@ class AccountsIndex < Chewy::Index
 
     analyzer: {
       natural: {
-        tokenizer: 'standard',
+        char_filter:[
+          "icu_normalizer"
+        ],
+        tokenizer: 'kuromoji_tokenizer',
         filter: %w(
           lowercase
           asciifolding
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index c717de66ff465b..6fe811320e394d 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -28,7 +28,7 @@ class StatusesIndex < Chewy::Index
       },
 
       content: {
-        tokenizer: 'standard',
+        tokenizer: 'kuromoji_tokenizer',
         filter: %w(
           lowercase
           asciifolding