diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
index a7246c00e7..304eca507f 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
@@ -217,6 +217,13 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 						},
 					},
 				},
+				{
+					displayName: 'Include Metadata',
+					name: 'includeDocumentMetadata',
+					type: 'boolean',
+					default: true,
+					description: 'Whether or not to include document metadata',
+				},
 				// ID is always used for update operation
 				{
 					displayName: 'ID',
@@ -269,11 +276,16 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 						topK,
 						filter,
 					);
+					const includeDocumentMetadata = this.getNodeParameter(
+						'includeDocumentMetadata',
+						itemIndex,
+						true,
+					) as boolean;
 
 					const serializedDocs = docs.map(([doc, score]) => {
 						const document = {
-							metadata: doc.metadata,
 							pageContent: doc.pageContent,
+							...(includeDocumentMetadata ? { metadata: doc.metadata } : {}),
 						};
 
 						return {
@@ -409,7 +421,7 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 				const includeDocumentMetadata = this.getNodeParameter(
 					'includeDocumentMetadata',
 					itemIndex,
-					false,
+					true,
 				) as boolean;
 
 				const vectorStoreTool = new DynamicTool({
@@ -484,17 +496,6 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 			// 	default: 'auto',
 			// };
 
-			// todo move out
-			const metadataProp: INodeProperties = {
-				displayName: 'Include Metadata',
-				name: 'includeDocumentMetadata',
-				type: 'boolean',
-				default: false,
-				description: 'Whether or not to include document metadata',
-			};
-
-			description.properties.unshift(metadataProp);
-
 			const descProp: INodeProperties = {
 				displayName: 'Description',
 				name: 'toolDescription',