diff --git a/apps/sim/tools/knowledge/create_document.ts b/apps/sim/tools/knowledge/create_document.ts
index 3f1f801babf..bd80bcc2418 100644
--- a/apps/sim/tools/knowledge/create_document.ts
+++ b/apps/sim/tools/knowledge/create_document.ts
@@ -124,6 +124,7 @@ export const knowledgeCreateDocumentTool: InternalToolConfig<any, KnowledgeCreat
       // Handle multiple documents response
       const uploadCount = documentsCreated.length
       const firstDocument = documentsCreated[0]
+      const documentId = firstDocument?.documentId || firstDocument?.id || ''
 
       return {
         success: true,
@@ -132,8 +133,9 @@ export const knowledgeCreateDocumentTool: InternalToolConfig<any, KnowledgeCreat
             uploadCount > 1
               ? `Successfully created ${uploadCount} documents in knowledge base`
               : `Successfully created document in knowledge base`,
+          documentId,
           data: {
-            documentId: firstDocument?.documentId || firstDocument?.id || '',
+            documentId,
             documentName:
               uploadCount > 1 ? `${uploadCount} documents` : firstDocument?.filename || 'Unknown',
             type: 'document',
diff --git a/apps/sim/tools/knowledge/knowledge.test.ts b/apps/sim/tools/knowledge/knowledge.test.ts
index 0890360ab77..0ec7a8f2706 100644
--- a/apps/sim/tools/knowledge/knowledge.test.ts
+++ b/apps/sim/tools/knowledge/knowledge.test.ts
@@ -157,6 +157,45 @@ describe('Knowledge Tools', () => {
     })
   })
 
+  describe('knowledgeCreateDocumentTool', () => {
+    describe('transformResponse', () => {
+      it('exposes the created document ID at both the top level and nested data path', async () => {
+        const result = await knowledgeCreateDocumentTool.transformResponse!(
+          createMockResponse({
+            data: {
+              documentsCreated: [{ documentId: 'doc-123', filename: 'document.txt' }],
+            },
+          })
+        )
+
+        expect(result.success).toBe(true)
+        expect(result.output.documentId).toBe('doc-123')
+        expect(result.output.data.documentId).toBe('doc-123')
+      })
+
+      it('uses the legacy document ID fallback for both output paths', async () => {
+        const result = await knowledgeCreateDocumentTool.transformResponse!(
+          createMockResponse({
+            documentsCreated: [{ id: 'legacy-doc-123', filename: 'document.txt' }],
+          })
+        )
+
+        expect(result.output.documentId).toBe('legacy-doc-123')
+        expect(result.output.data.documentId).toBe('legacy-doc-123')
+      })
+
+      it('preserves empty IDs when no documents are created', async () => {
+        const result = await knowledgeCreateDocumentTool.transformResponse!(
+          createMockResponse({ data: { documentsCreated: [] } })
+        )
+
+        expect(result.success).toBe(true)
+        expect(result.output.documentId).toBe('')
+        expect(result.output.data.documentId).toBe('')
+      })
+    })
+  })
+
   describe('knowledgeSearchTool', () => {
     describe('transformResponse', () => {
       it('should restructure cost information for logging', async () => {
diff --git a/apps/sim/tools/knowledge/types.ts b/apps/sim/tools/knowledge/types.ts
index 2dfd64a2f5d..0bf1498e0a3 100644
--- a/apps/sim/tools/knowledge/types.ts
+++ b/apps/sim/tools/knowledge/types.ts
@@ -132,6 +132,7 @@ export interface KnowledgeCreateDocumentResponse {
   output: {
     data: KnowledgeCreateDocumentResult
     message: string
+    documentId: string
   }
   error?: string
 }
diff --git a/apps/sim/tools/schema-enrichers.test.ts b/apps/sim/tools/schema-enrichers.test.ts
index 2cdbb82423e..531760dd164 100644
--- a/apps/sim/tools/schema-enrichers.test.ts
+++ b/apps/sim/tools/schema-enrichers.test.ts
@@ -131,7 +131,7 @@ describe('enrichKBTagsSchema', () => {
   it('omits the executionId outside an active run', async () => {
     mockListKnowledgeTagsAsExecutor.mockResolvedValue([])
 
-    await enrichKBTagsSchema('kb-1', {
+    const result = await enrichKBTagsSchema('kb-1', {
       userId: 'user-1',
       workspaceId: 'workspace-1',
       workflowId: 'workflow-1',
@@ -148,6 +148,7 @@ describe('enrichKBTagsSchema', () => {
         executorDelegationOrigin: EXECUTOR_ORIGIN,
       },
     })
+    expect(result).toBeNull()
   })
 
   it.each([