diff --git a/lib/galaxy/webapps/galaxy/api/workflows.py b/lib/galaxy/webapps/galaxy/api/workflows.py
index 57196020f60..f0e7aa9e6f5 100644
--- a/lib/galaxy/webapps/galaxy/api/workflows.py
+++ b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -316,8 +316,8 @@ class WorkflowsAPIController(BaseAPIController, UsesStoredWorkflowMixin, UsesAnn
         """
         tool_id         = payload.get( 'tool_id', None )
         tool_version    = payload.get( 'tool_version', None )
-        tool_inputs     = payload.get( 'inputs', None )
-        annotation      = payload.get( 'annotation', '' )
+        tool_inputs     = payload.get( 'inputs', {} )
+        annotation      = payload.get( 'annotation', tool_inputs.get('annotation', '') )
 
         # load tool
         tool = self._get_tool( tool_id, tool_version=tool_version, user=trans.user )