diff --git a/web/apps/photos/src/components/Upload/Uploader.tsx b/web/apps/photos/src/components/Upload/Uploader.tsx
index eeb869faa..2ae077daf 100644
--- a/web/apps/photos/src/components/Upload/Uploader.tsx
+++ b/web/apps/photos/src/components/Upload/Uploader.tsx
@@ -672,7 +672,8 @@ export default function Uploader(props: Props) {
             const uploaderName = uploadManager.getUploaderName();
             await preUploadAction();
             await uploadManager.queueFilesForUpload(
-                filesWithCollections.files,
+                /* TODO(MR): ElectronFile changes */
+                filesWithCollections.files as FileWithCollection[],
                 filesWithCollections.collections,
                 uploaderName,
             );
diff --git a/web/apps/photos/src/services/ffmpeg.ts b/web/apps/photos/src/services/ffmpeg.ts
index f80227264..30ab76323 100644
--- a/web/apps/photos/src/services/ffmpeg.ts
+++ b/web/apps/photos/src/services/ffmpeg.ts
@@ -167,8 +167,9 @@ const ffmpegExec = async (
     timeoutMS: number = 0,
 ): Promise<File | ElectronFile> => {
     const electron = globalThis.electron;
-    if (electron) {
-        return electron.runFFmpegCmd(cmd, inputFile, outputFilename, timeoutMS);
+    if (electron || false) {
+        /* TODO(MR): ElectronFile changes */
+        // return electron.runFFmpegCmd(cmd, inputFile, outputFilename, timeoutMS);
     } else {
         return workerFactory
             .instance()
diff --git a/web/apps/photos/src/services/searchService.ts b/web/apps/photos/src/services/searchService.ts
index 50e95da5b..dfe6f2006 100644
--- a/web/apps/photos/src/services/searchService.ts
+++ b/web/apps/photos/src/services/searchService.ts
@@ -294,7 +294,7 @@ async function getClipSuggestion(
     }
 
     const clipResults = await searchClip(searchPhrase);
-    if (!clipResults) return clipResults;
+    if (!clipResults) return undefined;
     return {
         type: SuggestionType.CLIP,
         value: clipResults,
diff --git a/web/apps/photos/src/services/upload/metadataService.ts b/web/apps/photos/src/services/upload/metadataService.ts
index 904a59d59..d1c98ff69 100644
--- a/web/apps/photos/src/services/upload/metadataService.ts
+++ b/web/apps/photos/src/services/upload/metadataService.ts
@@ -26,6 +26,7 @@ import {
     ParsedExtractedMetadata,
     ParsedMetadataJSON,
     ParsedMetadataJSONMap,
+    type FileWithCollection,
     type FileWithCollection2,
     type LivePhotoAssets2,
 } from "types/upload";
@@ -369,7 +370,11 @@ export async function extractLivePhotoMetadata(
         imageFileTypeInfo,
         livePhotoAssets.image,
     );
-    const videoHash = await getFileHash(worker, livePhotoAssets.video);
+    const videoHash = await getFileHash(
+        worker,
+        /* TODO(MR): ElectronFile changes */
+        livePhotoAssets.video as File | ElectronFile,
+    );
     return {
         metadata: {
             ...imageMetadata,
@@ -426,13 +431,15 @@ export async function clusterLivePhotoFiles(mediaFiles: FileWithCollection2[]) {
                 collectionID: firstMediaFile.collectionID,
                 fileType: firstFileType,
                 name: getFileName(firstMediaFile.file),
-                size: firstMediaFile.file.size,
+                /* TODO(MR): ElectronFile changes */
+                size: (firstMediaFile as FileWithCollection).file.size,
             };
             const secondFileIdentifier: LivePhotoIdentifier = {
                 collectionID: secondMediaFile.collectionID,
                 fileType: secondFileType,
                 name: getFileName(secondMediaFile.file),
-                size: secondMediaFile.file.size,
+                /* TODO(MR): ElectronFile changes */
+                size: (secondMediaFile as FileWithCollection).file.size,
             };
             if (
                 areFilesLivePhotoAssets(
diff --git a/web/apps/photos/src/services/upload/uploadService.ts b/web/apps/photos/src/services/upload/uploadService.ts
index b5bea30a1..78953bd24 100644
--- a/web/apps/photos/src/services/upload/uploadService.ts
+++ b/web/apps/photos/src/services/upload/uploadService.ts
@@ -445,7 +445,8 @@ export async function extractFileMetadata(
 
     const { metadata, publicMagicMetadata } = await extractMetadata(
         worker,
-        rawFile,
+        /* TODO(MR): ElectronFile changes */
+        rawFile as File | ElectronFile,
         fileTypeInfo,
     );
 
@@ -565,7 +566,9 @@ export async function uploader(
     fileWithCollection: FileWithCollection2,
     uploaderName: string,
 ): Promise<UploadResponse> {
-    const { collection, localID, ...uploadAsset } = fileWithCollection;
+    const { collection, localID, ...uploadAsset2 } = fileWithCollection;
+    /* TODO(MR): ElectronFile changes */
+    const uploadAsset = uploadAsset2 as UploadAsset;
     const fileNameSize = `${uploadService.getAssetName(
         fileWithCollection,
     )}_${convertBytesToHumanReadable(uploadService.getAssetSize(uploadAsset))}`;