diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index edf9f264f..24c8cc860 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -130,7 +130,7 @@ export class WorkflowDataProxy {
 				throw new Error(`No execution data found for node "${nodeName}"`);
 			}
 
-			runIndex = runIndex === undefined ? that.runIndex : 0;
+			runIndex = runIndex === undefined ? that.runIndex : runIndex;
 
 			if (that.runExecutionData.resultData.runData[nodeName].length < runIndex) {
 				throw new Error(`No execution data found for run "${runIndex}" of node "${nodeName}"`);
@@ -201,7 +201,7 @@ export class WorkflowDataProxy {
 				name = name.toString();
 
 				if (['binary', 'data', 'json'].includes(name)) {
-					const executionData = that.getNodeExecutionData(name, shortSyntax);
+					const executionData = that.getNodeExecutionData(nodeName, shortSyntax);
 
 					if (executionData.length <= that.itemIndex) {
 						throw new Error(`No data found for item-index: "${that.itemIndex}"`);
diff --git a/packages/workflow/test/Workflow.test.ts b/packages/workflow/test/Workflow.test.ts
index 09cc1b871..00080e277 100644
--- a/packages/workflow/test/Workflow.test.ts
+++ b/packages/workflow/test/Workflow.test.ts
@@ -1203,11 +1203,12 @@ describe('Workflow', () => {
 							{
 								startTime: 1,
 								executionTime: 1,
-								// @ts-ignore
 								data: {
 									main: [
 										[
-											{}
+											{
+												json: {},
+											}
 										]
 									]
 								}