diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index fc6eb37e..3bd555db 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -894,11 +894,7 @@ export class BrowserWindow {
         })
 
         app.on('before-quit', () => {
-            BrowserWindow.win.webContents.executeJavaScript(` 
-            window.localStorage.setItem("currentTrack", JSON.stringify(app.mk.nowPlayingItem));
-            window.localStorage.setItem("currentTime", JSON.stringify(app.mk.currentPlaybackTime));
-            window.localStorage.setItem("currentQueue", JSON.stringify(app.mk.queue.items));
-            ipcRenderer.send('stopGCast','');`)
+
         })
 
 
@@ -1131,6 +1127,11 @@ export class BrowserWindow {
         let isQuiting = false
 
         BrowserWindow.win.on("close", (event: Event) => {
+            BrowserWindow.win.webContents.executeJavaScript(` 
+            window.localStorage.setItem("currentTrack", JSON.stringify(app.mk.nowPlayingItem));
+            window.localStorage.setItem("currentTime", JSON.stringify(app.mk.currentPlaybackTime));
+            window.localStorage.setItem("currentQueue", JSON.stringify(app.mk.queue.items));
+            ipcRenderer.send('stopGCast','');`)
             if ((utils.getStoreValue('general.close_button_hide') || process.platform === "darwin") && !isQuiting) {
                 event.preventDefault();
                 BrowserWindow.win.hide();