diff --git a/docs/changelog/123743.yaml b/docs/changelog/123743.yaml
new file mode 100644
index 0000000000000..50fccfd6030ae
--- /dev/null
+++ b/docs/changelog/123743.yaml
@@ -0,0 +1,5 @@
+pr: 123743
+summary: Adjust exception thrown when unable to load hunspell dict
+area: Analysis
+type: bug
+issues: []
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices.analyze/15_analyze.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices.analyze/15_analyze.yml
index 24e04174cd1e4..72d74fa51d6af 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices.analyze/15_analyze.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices.analyze/15_analyze.yml
@@ -64,11 +64,11 @@
 "Custom analyzer is not buildable":
   - requires:
       test_runner_features: [ capabilities ]
-      reason: This capability required to run test
       capabilities:
-        - method: GET
-          path: /_analyze
-          capabilities: [ wrong_custom_analyzer_returns_400 ]
+        - method: PUT
+          path: /{index}
+          capabilities: [ hunspell_dict_400 ]
+      reason: "bugfix 'hunspell_dict_400' capability required"
 
   - do:
       catch: bad_request
@@ -80,7 +80,3 @@
           filter:
             type: hunspell
             locale: en_US
-
-  - match: { status: 400 }
-  - match: { error.type: illegal_argument_exception }
-  - match: { error.reason: "Can not build a custom analyzer" }
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml
index 7fe95aa4f4ff1..dc5fcf1596e89 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/10_basic.yml
@@ -273,3 +273,30 @@
 
   - match: { error.type: "mapper_parsing_exception" }
   - match: { error.reason: "Failed to parse mapping: The mapper type [invalid] declared on field [raw] does not exist. It might have been created within a future version or requires a plugin to be installed. Check the documentation." }
+---
+"Create index with hunspell missing dict":
+  - requires:
+      test_runner_features: [ capabilities ]
+      capabilities:
+        - method: PUT
+          path: /{index}
+          capabilities: [ hunspell_dict_400 ]
+      reason: "bugfix 'hunspell_dict_400' capability required"
+
+  - do:
+      catch: bad_request
+      indices.create:
+        index: bad_hunspell_index
+        body:
+          settings:
+            analysis:
+              analyzer:
+                en:
+                  tokenizer: standard
+                  filter:
+                    - my_en_US_dict_stemmer
+                filter:
+                  my_en_US_dict_stemmer:
+                  type: hunspell
+                  locale: en_US
+                  dedup: false
diff --git a/server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java b/server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java
index bfe1cd9b28de1..ab6e20c39f720 100644
--- a/server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java
+++ b/server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java
@@ -99,7 +99,7 @@ public HunspellService(final Settings settings, final Environment env, final Map
             try {
                 return loadDictionary(locale, settings, env);
             } catch (Exception e) {
-                throw new IllegalStateException("failed to load hunspell dictionary for locale: " + locale, e);
+                throw new IllegalArgumentException("failed to load hunspell dictionary for locale: " + locale, e);
             }
         };
         if (HUNSPELL_LAZY_LOAD.get(settings) == false) {
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/CreateIndexCapabilities.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/CreateIndexCapabilities.java
index 334e68648d853..928c872b6ad71 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/CreateIndexCapabilities.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/CreateIndexCapabilities.java
@@ -28,9 +28,12 @@ public class CreateIndexCapabilities {
 
     private static final String NESTED_DENSE_VECTOR_SYNTHETIC_TEST = "nested_dense_vector_synthetic_test";
 
+    private static final String HUNSPELL_DICT_400 = "hunspell_dict_400";
+
     public static final Set<String> CAPABILITIES = Set.of(
         LOGSDB_INDEX_MODE_CAPABILITY,
         LOOKUP_INDEX_MODE_CAPABILITY,
-        NESTED_DENSE_VECTOR_SYNTHETIC_TEST
+        NESTED_DENSE_VECTOR_SYNTHETIC_TEST,
+        HUNSPELL_DICT_400
     );
 }
diff --git a/server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java b/server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java
index 1a27954eed98b..8530fd21ea77d 100644
--- a/server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java
@@ -64,7 +64,7 @@ public void testDicWithNoAff() throws Exception {
             .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
             .build();
 
-        IllegalStateException e = expectThrows(IllegalStateException.class, () -> {
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> {
             final Environment environment = new Environment(settings, getDataPath("/indices/analyze/no_aff_conf_dir"));
             new HunspellService(settings, environment, emptyMap()).getDictionary("en_US");
         });
@@ -78,7 +78,7 @@ public void testDicWithTwoAffs() throws Exception {
             .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
             .build();
 
-        IllegalStateException e = expectThrows(IllegalStateException.class, () -> {
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> {
             final Environment environment = new Environment(settings, getDataPath("/indices/analyze/two_aff_conf_dir"));
             new HunspellService(settings, environment, emptyMap()).getDictionary("en_US");
         });