diff --git a/docs/config.png b/docs/config.png
index 70cefba8..6ff8e33a 100644
Binary files a/docs/config.png and b/docs/config.png differ
diff --git a/docs/config.puml b/docs/config.puml
index 4b361397..12af1399 100644
--- a/docs/config.puml
+++ b/docs/config.puml
@@ -12,7 +12,7 @@ class "AuthenticationConfiguration" as src.models.config.AuthenticationConfigura
 class "Configuration" as src.models.config.Configuration {
   authentication : Optional[AuthenticationConfiguration]
   customization : Optional[Customization]
-  inference : Optional[InferenceConfiguration]
+  inference
   llama_stack
   mcp_servers : list[ModelContextProtocolServer]
   name : str
@@ -86,6 +86,7 @@ class "UserDataCollection" as src.models.config.UserDataCollection {
   check_storage_location_is_set_when_needed() -> Self
 }
 src.models.config.DataCollectorConfiguration --* src.models.config.UserDataCollection : data_collector
+src.models.config.InferenceConfiguration --* src.models.config.Configuration : inference
 src.models.config.JwtConfiguration --* src.models.config.JwkConfiguration : jwt_configuration
 src.models.config.LlamaStackConfiguration --* src.models.config.Configuration : llama_stack
 src.models.config.ServiceConfiguration --* src.models.config.Configuration : service
diff --git a/src/configuration.py b/src/configuration.py
index 00790a3c..a5d7384c 100644
--- a/src/configuration.py
+++ b/src/configuration.py
@@ -106,7 +106,7 @@ def customization(self) -> Optional[Customization]:
         return self._configuration.customization
 
     @property
-    def inference(self) -> Optional[InferenceConfiguration]:
+    def inference(self) -> InferenceConfiguration:
         """Return inference configuration."""
         assert (
             self._configuration is not None
diff --git a/src/models/config.py b/src/models/config.py
index a6f3cc59..961c3797 100644
--- a/src/models/config.py
+++ b/src/models/config.py
@@ -249,7 +249,7 @@ class Configuration(BaseModel):
         AuthenticationConfiguration()
     )
     customization: Optional[Customization] = None
-    inference: Optional[InferenceConfiguration] = InferenceConfiguration()
+    inference: InferenceConfiguration = InferenceConfiguration()
 
     def dump(self, filename: str = "configuration.json") -> None:
         """Dump actual configuration into JSON file."""
diff --git a/tests/unit/models/test_config.py b/tests/unit/models/test_config.py
index e5d19099..2801f4eb 100644
--- a/tests/unit/models/test_config.py
+++ b/tests/unit/models/test_config.py
@@ -577,7 +577,7 @@ def test_dump_configuration_with_one_mcp_server(tmp_path) -> None:
         ),
         mcp_servers=mcp_servers,
         customization=None,
-        inference=None,
+        inference=InferenceConfiguration(),
     )
     dump_file = tmp_path / "test.json"
     cfg.dump(dump_file)
@@ -628,7 +628,7 @@ def test_dump_configuration_with_more_mcp_servers(tmp_path) -> None:
         ),
         mcp_servers=mcp_servers,
         customization=None,
-        inference=None,
+        inference=InferenceConfiguration(),
     )
     dump_file = tmp_path / "test.json"
     cfg.dump(dump_file)