diff --git a/app/lib/admin/system_check/elasticsearch_check.rb b/app/lib/admin/system_check/elasticsearch_check.rb
index 3950756e6a..e427c83f82 100644
--- a/app/lib/admin/system_check/elasticsearch_check.rb
+++ b/app/lib/admin/system_check/elasticsearch_check.rb
@@ -16,7 +16,7 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
   def pass?
     return true unless Chewy.enabled?
 
-    running_version.present? && compatible_version? && cluster_health['status'] == 'green' && indexes_match? && preset_matches?
+    running_version.present? && compatible_version? && cluster_health['status'] == 'green' && indexes_match? && specifications_match? && preset_matches?
   rescue Faraday::ConnectionFailed, Elasticsearch::Transport::Transport::Error
     false
   end
@@ -40,7 +40,7 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
       )
     elsif !specifications_match?
       Admin::SystemCheck::Message.new(
-        :elasticsearch_analysis_mismatch,
+        :elasticsearch_analysis_index_mismatch,
         mismatched_specifications_indexes.join(' ')
       )
     elsif cluster_health['status'] == 'red'
diff --git a/spec/lib/admin/system_check/elasticsearch_check_spec.rb b/spec/lib/admin/system_check/elasticsearch_check_spec.rb
index 05d204c453..702c19cf09 100644
--- a/spec/lib/admin/system_check/elasticsearch_check_spec.rb
+++ b/spec/lib/admin/system_check/elasticsearch_check_spec.rb
@@ -29,6 +29,9 @@ RSpec.describe Admin::SystemCheck::ElasticsearchCheck do
             },
           },
         })
+        [AccountsIndex, StatusesIndex, PublicStatusesIndex, InstancesIndex, TagsIndex].each do |index|
+          allow(index).to receive(:specification).and_return(instance_double(Chewy::Index::Specification, changed?: false))
+        end
       end
 
       context 'when running version is present and high enough' do