diff --git a/packages/runtime/src/services/document-chunks/document-chunks.ts b/packages/runtime/src/services/document-chunks/document-chunks.ts
index b687e12..7c947a6 100644
--- a/packages/runtime/src/services/document-chunks/document-chunks.ts
+++ b/packages/runtime/src/services/document-chunks/document-chunks.ts
@@ -2,7 +2,6 @@ import { DatabaseService, tableNames, type TableRows } from '../database/databas
 import { EmbeddingsService } from '../embeddings/embeddings.js';
 import type { Services } from '../../utils/utils.services.js';
 import { EMBEDDING_MODEL } from '../../utils/utils.consts.js';
-import type { ExplicitAny } from '../../global.js';
 import { applyQueryFilter } from '../../utils/utils.query.js';
 
 import type { DocumentChunkFilter, DocumentChunksFindResult } from './document-chunks.schemas.js';
diff --git a/packages/runtime/src/services/documents/documents.ts b/packages/runtime/src/services/documents/documents.ts
index 27e97f8..e9bf3ec 100644
--- a/packages/runtime/src/services/documents/documents.ts
+++ b/packages/runtime/src/services/documents/documents.ts
@@ -191,7 +191,7 @@ class DocumentsService extends EventEmitter<DocumentsServiceEvents> {
 
     const result = await db.transaction(async (trx) => {
       let id = document.id || crypto.randomUUID();
-      if (document.source && document.sourceId) {
+      if (!document.id && document.source && document.sourceId) {
         const [currentSourceDocument] = await trx<TableRows['documents']>(tableNames.documents)
           .where('source', document.source)
           .andWhere('sourceId', document.sourceId)
@@ -203,6 +203,8 @@ class DocumentsService extends EventEmitter<DocumentsServiceEvents> {
       const now = new Date();
       const [current] = await trx<TableRows['documents']>(tableNames.documents).where('id', id).limit(1);
       if (current) {
+        id = current.id;
+        document.id = id;
         if (
           compareObjectKeys(current, document, [
             'sourceId',
@@ -249,7 +251,7 @@ class DocumentsService extends EventEmitter<DocumentsServiceEvents> {
           updatedAt: now,
         });
         const resultDocument: Document = mapFromDocumentRow({
-          type: 'raw',
+          type: null,
           text: null,
           owner: null,
           contentType: null,
diff --git a/packages/runtime/src/utils/utils.compare.ts b/packages/runtime/src/utils/utils.compare.ts
index 61c0752..c82c234 100644
--- a/packages/runtime/src/utils/utils.compare.ts
+++ b/packages/runtime/src/utils/utils.compare.ts
@@ -8,6 +8,9 @@ const compareObjectKeys = <A extends Record<string, unknown>, B extends Record<s
   for (const key of keys) {
     const avalue = a[key as keyof A];
     const bvalue = b[key as keyof B];
+    if (bvalue === undefined) {
+      continue;
+    }
     if (!deepEqual(avalue, bvalue)) {
       return false;
     }