1 files changed, 15 insertions, 2 deletions
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 250a501e0..c1abd6e71 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -1841,9 +1841,21 @@ export namespace DocUtils {
         });
     }
 
+    /**
+     * uploadFilesToDocs will take in an array of Files, and creates documents for the 
+     * new files. 
+     * 
+     * @param files an array of files that will be uploaded
+     * @param options options to use while uploading
+     * @returns 
+     */
     export async function uploadFilesToDocs(files: File[], options: DocumentOptions) {
         const generatedDocuments: Doc[] = [];
-        const upfiles = await Networking.UploadFilesToServer(files);
+
+        // These files do not have overwriteDocs, so we do not set the guid and let the client generate one. 
+        const fileNoGuidPairs: Networking.FileGuidPair[] = files.map(file => ({file}));
+
+        const upfiles = await Networking.UploadFilesToServer(fileNoGuidPairs);
         for (const {
             source: { name, type },
             result,
@@ -1855,7 +1867,8 @@ export namespace DocUtils {
 
     export function uploadFileToDoc(file: File, options: DocumentOptions, overwriteDoc: Doc) {
         const generatedDocuments: Doc[] = [];
-        Networking.UploadFilesToServer([file]).then(upfiles => {
+        // Since this file has an overwriteDoc, we can set the client tracking guid to the overwriteDoc's guid. 
+        Networking.UploadFilesToServer([{file, guid: overwriteDoc[Id]}]).then(upfiles => {
             const {
                 source: { name, type },
                 result,