diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiModelConfigServiceImpl.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiModelConfigServiceImpl.java
index 8c852f8cde..45f58492d5 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiModelConfigServiceImpl.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/main/java/ai/chat2db/community/domain/core/impl/ai/AiModelConfigServiceImpl.java
@@ -145,10 +145,12 @@ public synchronized List<AiModelOptionItem> listModelOptions() {
             }
             for (String model : models) {
                 AiModelOptionItem item = new AiModelOptionItem();
-                item.setValue(presetOptionValue(provider, model));
+                String presetOptionValue = presetOptionValue(provider, model);
+                item.setValue(presetOptionValue);
                 item.setLabel(model);
                 item.setProvider(provider.name());
                 item.setModel(model);
+                item.setModelConfigId(presetOptionValue);
                 item.setCustomOption(Boolean.FALSE);
                 item.setDefaultOption(Boolean.FALSE);
                 options.add(item);
diff --git a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiModelConfigServiceImplServerPresetTest.java b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiModelConfigServiceImplServerPresetTest.java
index 7708aeca03..79c69a0e32 100644
--- a/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiModelConfigServiceImplServerPresetTest.java
+++ b/chat2db-community-server/chat2db-community-domain/chat2db-community-domain-core/src/test/java/ai/chat2db/community/domain/core/impl/ai/AiModelConfigServiceImplServerPresetTest.java
@@ -26,8 +26,10 @@ class AiModelConfigServiceImplServerPresetTest {
     void completeConfigurationExposesAndResolvesOnlyDeclaredPreset() {
         AiModelConfigServiceImpl service = service(configuration("https://codex.hazycloud.io/v1"));
 
+        var options = service.listModelOptions();
         assertEquals(List.of("preset:OPENAI:gpt-5.4"),
-                service.listModelOptions().stream().map(option -> option.getValue()).toList());
+                options.stream().map(option -> option.getValue()).toList());
+        assertEquals("preset:OPENAI:gpt-5.4", options.get(0).getModelConfigId());
 
         var runtime = service.resolveRuntimeModel(preset("preset:OPENAI:gpt-5.4"));
         assertEquals("OPENAI", runtime.getProvider());