diff --git a/src/app/drive/components/FileViewer/FileViewerWrapper.tsx b/src/app/drive/components/FileViewer/FileViewerWrapper.tsx
index 3b326f2e1d..6e96a3e57b 100644
--- a/src/app/drive/components/FileViewer/FileViewerWrapper.tsx
+++ b/src/app/drive/components/FileViewer/FileViewerWrapper.tsx
@@ -270,7 +270,7 @@ const FileViewerWrapper = ({
 
     if (isDifferentThumbnailOrNotExists && thumbnailGenerated.file) {
       const thumbnailToUpload: ThumbnailToUpload = {
-        fileId: driveFile.id,
+        fileId: driveFile.uuid,
         size: thumbnailGenerated.file.size,
         max_width: thumbnailGenerated.max_width,
         max_height: thumbnailGenerated.max_height,
diff --git a/src/app/drive/services/file.service/uploadFile.ts b/src/app/drive/services/file.service/uploadFile.ts
index 39f6f2a14b..2711f9168f 100644
--- a/src/app/drive/services/file.service/uploadFile.ts
+++ b/src/app/drive/services/file.service/uploadFile.ts
@@ -112,7 +112,7 @@ export async function uploadFile(
     };
   }
 
-  const generatedThumbnail = await generateThumbnailFromFile(file, response.id, userEmail, options.isTeam);
+  const generatedThumbnail = await generateThumbnailFromFile(file, response.uuid, userEmail, options.isTeam);
   if (generatedThumbnail?.thumbnail) {
     response.thumbnails.push(generatedThumbnail.thumbnail);
     if (generatedThumbnail.thumbnailFile) {
diff --git a/src/app/drive/services/thumbnail.service.ts b/src/app/drive/services/thumbnail.service.ts
index c73633f747..5a16cb64c7 100644
--- a/src/app/drive/services/thumbnail.service.ts
+++ b/src/app/drive/services/thumbnail.service.ts
@@ -23,7 +23,7 @@ import { getEnvironmentConfig } from './network.service';
 import { FileToUpload } from './file.service/types';
 
 export interface ThumbnailToUpload {
-  fileId: number;
+  fileId: string;
   size: number;
   max_width: number;
   max_height: number;
@@ -130,19 +130,19 @@ export const uploadThumbnail = async (
     abortController,
   });
 
-  const storageClient = SdkFactory.getInstance().createStorageClient();
-  const thumbnailEntry: StorageTypes.ThumbnailEntry = {
-    file_id: thumbnailToUpload.fileId,
-    max_width: thumbnailToUpload.max_width,
-    max_height: thumbnailToUpload.max_height,
-    type: thumbnailToUpload.type,
+  const storageClient = SdkFactory.getNewApiInstance().createNewStorageClient();
+  const thumbnailEntry: StorageTypes.CreateThumbnailEntryPayload = {
+    bucketFile,
+    bucketId,
+    encryptVersion: StorageTypes.EncryptionVersion.Aes03,
+    fileUuid: thumbnailToUpload.fileId,
+    maxHeight: thumbnailToUpload.max_height,
+    maxWidth: thumbnailToUpload.max_width,
     size: thumbnailToUpload.size,
-    bucket_id: bucketId,
-    bucket_file: bucketFile,
-    encrypt_version: StorageTypes.EncryptionVersion.Aes03,
+    type: thumbnailToUpload.type,
   };
 
-  return await storageClient.createThumbnailEntry(thumbnailEntry);
+  return await storageClient.createThumbnailEntryWithUUID(thumbnailEntry);
 };
 
 /**
@@ -176,7 +176,7 @@ export const getThumbnailFrom = async (fileToUpload: FileToUpload): Promise<Thum
 
 export const generateThumbnailFromFile = async (
   fileToUpload: FileToUpload,
-  fileId: number,
+  fileId: string,
   userEmail: string,
   isTeam: boolean,
 ): Promise<{ thumbnail: Thumbnail; thumbnailFile: File } | null> => {