diff --git a/client/src/components/Workflow/Editor/Node.vue b/client/src/components/Workflow/Editor/Node.vue
index 9e06f0aafad..7fb08436b22 100644
--- a/client/src/components/Workflow/Editor/Node.vue
+++ b/client/src/components/Workflow/Editor/Node.vue
@@ -314,7 +314,7 @@ export default {
         },
         setData(data) {
             this.config_form = data.config_form;
-            this.content_id = data.config_form?.id || data.content_id || this.content_id;
+            this.content_id = data.content_id;
             this.tool_state = data.tool_state;
             this.errors = data.errors;
             this.tooltip = data.tooltip || "";
diff --git a/lib/galaxy/webapps/galaxy/api/workflows.py b/lib/galaxy/webapps/galaxy/api/workflows.py
index 73c27bdc60c..b520e6eb9ad 100644
--- a/lib/galaxy/webapps/galaxy/api/workflows.py
+++ b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -699,6 +699,7 @@ class WorkflowsAPIController(BaseGalaxyAPIController, UsesStoredWorkflowMixin, U
             'annotation': inputs.get('__annotation', ''),
             'name': module.get_name(),
             'tool_state': module.get_state(),
+            'content_id': module.get_content_id(),
             'inputs': module.get_all_inputs(connectable_only=True),
             'outputs': module.get_all_outputs(),
             'config_form': module.get_config_form(),