diff --git a/app/chewy/public_statuses_index.rb b/app/chewy/public_statuses_index.rb
index 09a4dfc09..c77aa853e 100644
--- a/app/chewy/public_statuses_index.rb
+++ b/app/chewy/public_statuses_index.rb
@@ -21,6 +21,13 @@ class PublicStatusesIndex < Chewy::Index
       },
     },
 
+    tokenizer: {
+      nori: {
+        type: 'nori_tokenizer',
+        decompound_mode: 'mixed',
+      },
+    },
+
     analyzer: {
       verbatim: {
         tokenizer: 'uax_url_email',
@@ -28,7 +35,7 @@ class PublicStatusesIndex < Chewy::Index
       },
 
       content: {
-        tokenizer: 'standard',
+        tokenizer: 'nori',
         filter: %w(
           lowercase
           asciifolding
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index e739ccecb..d445638c4 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -21,6 +21,13 @@ class StatusesIndex < Chewy::Index
       },
     },
 
+    tokenizer: {
+      nori: {
+        type: 'nori_tokenizer',
+        decompound_mode: 'mixed',
+      },
+    },
+
     analyzer: {
       verbatim: {
         tokenizer: 'uax_url_email',
@@ -28,7 +35,7 @@ class StatusesIndex < Chewy::Index
       },
 
       content: {
-        tokenizer: 'standard',
+        tokenizer: 'nori',
         filter: %w(
           lowercase
           asciifolding