diff --git a/lib/galaxy/workflow/modules.py b/lib/galaxy/workflow/modules.py
index ea8ec77e351..08eef57e3b0 100644
--- a/lib/galaxy/workflow/modules.py
+++ b/lib/galaxy/workflow/modules.py
@@ -2127,10 +2127,10 @@ class PickValueModule(WorkflowModule):
         history = invocation.history
         hda = model.HistoryDatasetAssociation(
             name="Pick Value - skipped",
-            history=history,
             create_dataset=True,
             flush=False,
         )
+        history.add_dataset(hda)
         object_store_populator = ObjectStorePopulator(trans.app, trans.user)
         hda.set_skipped(object_store_populator, replace_dataset=False)
         trans.sa_session.add(hda)