diff --git a/index.js b/index.js
index d202628..57bdf03 100644
--- a/index.js
+++ b/index.js
@@ -67,6 +67,9 @@ function createWindow () {
 
   win.on('close', (event)=>{
     windowState.saveState(win);
+		if (server.deemixApp.getSettings().settings.clearQueueOnExit){
+			server.deemixApp.cancelAllDownloads()
+		}
   })
 }
 
diff --git a/webui b/webui
index b0f08ee..5553ad4 160000
--- a/webui
+++ b/webui
@@ -1 +1 @@
-Subproject commit b0f08ee19693a7a9030003c9fafbbbb4e55e78ad
+Subproject commit 5553ad4ebf8acb6b7db5996b382ade711ef1e51e