diff --git a/apps/photos/src/services/ffmpeg/ffmpegService.ts b/apps/photos/src/services/ffmpeg/ffmpegService.ts
index 4333c733a..4a0148194 100644
--- a/apps/photos/src/services/ffmpeg/ffmpegService.ts
+++ b/apps/photos/src/services/ffmpeg/ffmpegService.ts
@@ -90,7 +90,8 @@ export async function convertToMP4(file: File | ElectronFile) {
                 OUTPUT_PATH_PLACEHOLDER,
             ],
             file,
-            'output.mp4'
+            'output.mp4',
+            true
         );
     } catch (e) {
         logError(e, 'ffmpeg convertToMP4 failed');
diff --git a/apps/photos/src/services/wasm/ffmpeg.ts b/apps/photos/src/services/wasm/ffmpeg.ts
index 3881f45bd..37963652e 100644
--- a/apps/photos/src/services/wasm/ffmpeg.ts
+++ b/apps/photos/src/services/wasm/ffmpeg.ts
@@ -42,7 +42,7 @@ export class WasmFFmpeg {
             if (dontTimeout) {
                 return this.execute(cmd, inputFile, outputFileName);
             } else {
-                promiseWithTimeout<File>(
+                return promiseWithTimeout<File>(
                     this.execute(cmd, inputFile, outputFileName),
                     FFMPEG_EXECUTION_WAIT_TIME
                 );
diff --git a/apps/photos/src/utils/error/index.ts b/apps/photos/src/utils/error/index.ts
index cbdfe3811..feee70709 100644
--- a/apps/photos/src/utils/error/index.ts
+++ b/apps/photos/src/utils/error/index.ts
@@ -30,7 +30,7 @@ export const CustomError = {
     INVALID_COLLECTION_OPERATION: 'invalid collection operation',
     TO_MOVE_FILES_FROM_MULTIPLE_COLLECTIONS:
         'to move files from multiple collections',
-    WAIT_TIME_EXCEEDED: 'thumbnail generation wait time exceeded',
+    WAIT_TIME_EXCEEDED: 'operation wait time exceeded',
     REQUEST_CANCELLED: 'request canceled',
     REQUEST_FAILED: 'request failed',
     TOKEN_EXPIRED: 'token expired',