diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 3dc650301..0150bc34c 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -207,13 +207,6 @@ export default function App({ Component, pageProps }: AppProps) {
             await resumeExportsIfNeeded();
         };
         initExport();
-        try {
-            eventBus.on(Events.LOGOUT, () => {
-                exportService.disableContinuousExport();
-            });
-        } catch (e) {
-            log.error("Error while subscribing to logout event", e);
-        }
     }, []);
 
     const setUserOnline = () => setOffline(false);
diff --git a/web/apps/photos/src/services/logout.ts b/web/apps/photos/src/services/logout.ts
index 0cd82fdd7..e9ba49597 100644
--- a/web/apps/photos/src/services/logout.ts
+++ b/web/apps/photos/src/services/logout.ts
@@ -2,6 +2,7 @@ import log from "@/next/log";
 import { accountLogout } from "@ente/accounts/services/logout";
 import { Events, eventBus } from "@ente/shared/events";
 import { clipService } from "services/clip-service";
+import exportService from "./export";
 import mlWorkManager from "./machineLearning/mlWorkManager";
 
 /**
@@ -20,14 +21,20 @@ export const photosLogout = async () => {
         log.error("Ignoring error in CLIP logout", e);
     }
 
-    try {
-        await mlWorkManager.setMlSearchEnabled(false);
-    } catch (e) {
-        log.error("Ignoring error in ML logout", e);
-    }
-
     const electron = globalThis.electron;
     if (electron) {
+        try {
+            await mlWorkManager.setMlSearchEnabled(false);
+        } catch (e) {
+            log.error("Ignoring error in ML logout", e);
+        }
+
+        try {
+            exportService.disableContinuousExport();
+        } catch (e) {
+            log.error("Ignoring error when export logout", e);
+        }
+
         try {
             await electron?.logout();
         } catch (e) {