diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 984dfb883b1..0b9e9c640f5 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -1017,6 +1017,9 @@ class JobParameter(object):
         self.name = name
         self.value = value
 
+    def copy(self):
+        return JobParameter(name=self.name, value=self.value)
+
 
 class JobToInputDatasetAssociation(object):
     def __init__(self, name, dataset):
diff --git a/lib/galaxy/tools/actions/__init__.py b/lib/galaxy/tools/actions/__init__.py
index 5ff1a25b0e6..c248141f433 100644
--- a/lib/galaxy/tools/actions/__init__.py
+++ b/lib/galaxy/tools/actions/__init__.py
@@ -531,6 +531,9 @@ class DefaultToolAction(object):
             # Duplicate PJAs before remap.
             for pjaa in old_job.post_job_actions:
                 current_job.add_post_job_action(pjaa.post_job_action)
+            for p in old_job.parameters:
+                if p.name.endswith('|__identifier__'):
+                    current_job.parameters.append(p.copy())
             remapped_hdas = {}
             input_hdcas = set()
             for jtod in old_job.output_datasets:
diff --git a/test/api/test_workflows.py b/test/api/test_workflows.py
index 77559b7468e..fcaf4e0f7c9 100644
--- a/test/api/test_workflows.py
+++ b/test/api/test_workflows.py
@@ -773,6 +773,8 @@ test_data:
                                             assert_ok=True)
             unpaused_dataset = self.dataset_populator.get_history_dataset_details(history_id, wait=True, assert_ok=False)
             assert unpaused_dataset['state'] == 'ok'
+            contents = self.dataset_populator.get_history_dataset_content(history_id, hid=7, assert_ok=False)
+            assert contents == 'fail\nsuccess\n', contents
 
     @skip_without_tool("collection_creates_pair")
     def test_workflow_run_output_collection_mapping(self):