diff --git a/server/src/app.ts b/server/src/app.ts
index d078bb6..db05648 100644
--- a/server/src/app.ts
+++ b/server/src/app.ts
@@ -363,9 +363,19 @@ export class DeemixApp {
 					switch (currentItem.__type__) {
 						case 'Single':
 							downloadObject = new Single(currentItem)
+							// Remove old incompatible queue items
+							if (downloadObject.single.trackAPI_gw) {
+								fs.unlinkSync(configFolder + `queue${sep}${filename}`)
+								return
+							}
 							break
 						case 'Collection':
 							downloadObject = new Collection(currentItem)
+							// Remove old incompatible queue items
+							if (downloadObject.collection.tracks_gw) {
+								fs.unlinkSync(configFolder + `queue${sep}${filename}`)
+								return
+							}
 							break
 						case 'Convertable':
 							downloadObject = new Convertable(currentItem)