diff --git a/backend/src/apiserver/resource/resource_manager_test.go b/backend/src/apiserver/resource/resource_manager_test.go
index 716d48df8ce..964fa3f79f0 100644
--- a/backend/src/apiserver/resource/resource_manager_test.go
+++ b/backend/src/apiserver/resource/resource_manager_test.go
@@ -1179,14 +1179,6 @@ func TestReportWorkflowResource_ScheduledWorkflowIDNotEmpty_Success(t *testing.T
 				WorkflowSpecManifest: workflow.GetWorkflowSpec().ToStringForStore(),
 			},
 			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID:  "WORKFLOW_1",
-					ResourceType:  common.Run,
-					ReferenceUUID: job.UUID,
-					ReferenceName: job.Name,
-					ReferenceType: common.Job,
-					Relationship:  common.Creator,
-				},
 				{
 					ResourceUUID:  "WORKFLOW_1",
 					ResourceType:  common.Run,
@@ -1195,6 +1187,14 @@ func TestReportWorkflowResource_ScheduledWorkflowIDNotEmpty_Success(t *testing.T
 					ReferenceType: common.Experiment,
 					Relationship:  common.Owner,
 				},
+				{
+					ResourceUUID:  "WORKFLOW_1",
+					ResourceType:  common.Run,
+					ReferenceUUID: job.UUID,
+					ReferenceName: job.Name,
+					ReferenceType: common.Job,
+					Relationship:  common.Creator,
+				},
 			},
 		},
 		PipelineRuntime: model.PipelineRuntime{WorkflowRuntimeManifest: workflow.ToStringForStore()},
@@ -1252,14 +1252,6 @@ func TestReportWorkflowResource_ScheduledWorkflowIDNotEmpty_NoExperiment_Success
 				WorkflowSpecManifest: workflow.GetWorkflowSpec().ToStringForStore(),
 			},
 			ResourceReferences: []*model.ResourceReference{
-				{
-					ResourceUUID:  "WORKFLOW_1",
-					ResourceType:  common.Run,
-					ReferenceUUID: newJob.UUID,
-					ReferenceName: newJob.Name,
-					ReferenceType: common.Job,
-					Relationship:  common.Creator,
-				},
 				{
 					ResourceUUID:  "WORKFLOW_1",
 					ResourceType:  common.Run,
@@ -1268,6 +1260,14 @@ func TestReportWorkflowResource_ScheduledWorkflowIDNotEmpty_NoExperiment_Success
 					ReferenceType: common.Experiment,
 					Relationship:  common.Owner,
 				},
+				{
+					ResourceUUID:  "WORKFLOW_1",
+					ResourceType:  common.Run,
+					ReferenceUUID: newJob.UUID,
+					ReferenceName: newJob.Name,
+					ReferenceType: common.Job,
+					Relationship:  common.Creator,
+				},
 			},
 		},
 		PipelineRuntime: model.PipelineRuntime{WorkflowRuntimeManifest: workflow.ToStringForStore()},
diff --git a/backend/src/apiserver/storage/run_store.go b/backend/src/apiserver/storage/run_store.go
index 12c138f60f6..cf20e487b31 100644
--- a/backend/src/apiserver/storage/run_store.go
+++ b/backend/src/apiserver/storage/run_store.go
@@ -210,7 +210,7 @@ func (s *RunStore) addMetricsAndResourceReferences(filteredSelectBuilder sq.Sele
 		Select("subq.*", resourceRefConcatQuery+" AS refs").
 		FromSelect(subQ, "subq").
 		// Append all the resource references for the run as a json column
-		LeftJoin("(select * from resource_references where ResourceType='Run') AS r ON subq.UUID=r.ResourceUUID").
+		LeftJoin("resource_references AS r ON r.ResourceType='Run' AND subq.UUID=r.ResourceUUID").
 		GroupBy("subq.UUID")
 }