1 files changed, 5 insertions, 1 deletions
diff --git a/src/github/daneren2005/dsub/service/DownloadService.java b/src/github/daneren2005/dsub/service/DownloadService.java
index d5a71207..eae4fda1 100644
--- a/src/github/daneren2005/dsub/service/DownloadService.java
+++ b/src/github/daneren2005/dsub/service/DownloadService.java
@@ -508,12 +508,16 @@ public class DownloadService extends Service {
 	}
 
 	public synchronized void clearIncomplete() {
-		reset();
 		Iterator<DownloadFile> iterator = downloadList.iterator();
 		while (iterator.hasNext()) {
 			DownloadFile downloadFile = iterator.next();
 			if (!downloadFile.isCompleteFileAvailable()) {
 				iterator.remove();
+				
+				// Reset if the current playing song has been removed
+				if(currentPlaying == downloadFile) {
+					reset();
+				}
 			}
 		}
 		lifecycleSupport.serializeDownloadQueue();