diff --git a/api/fields/workflow_fields.py b/api/fields/workflow_fields.py
index a7ec718bd6..46ff19eabe 100644
--- a/api/fields/workflow_fields.py
+++ b/api/fields/workflow_fields.py
@@ -49,6 +49,13 @@ conversation_variable_fields = {
     "description": fields.String,
 }
 
+model_config_fields = {
+    "provider": fields.String,
+    "name": fields.String,
+    "mode": fields.String,
+    "completion_params": fields.Raw,
+}
+
 memory_block_fields = {
     "id": fields.String,
     "name": fields.String,
@@ -61,7 +68,7 @@ memory_block_fields = {
     "update_turns": fields.Integer,
     "preserved_turns": fields.Integer,
     "schedule_mode": fields.String,
-    "model": fields.Raw,
+    "model": fields.Nested(model_config_fields),
     "end_user_visible": fields.Boolean,
     "end_user_editable": fields.Boolean,
 }
@@ -98,7 +105,7 @@ workflow_fields = {
     "tool_published": fields.Boolean,
     "environment_variables": fields.List(EnvironmentVariableField()),
     "conversation_variables": fields.List(fields.Nested(conversation_variable_fields)),
-    "memory_blocks": fields.List(fields.Nested(memory_block_fields)),
+    "memory_blocks": fields.Nested(memory_block_fields),
     "rag_pipeline_variables": fields.List(fields.Nested(pipeline_variable_fields)),
 }