diff --git a/lib/deck.cpp b/lib/deck.cpp
index 90a6807f..f5661aac 100644
--- a/lib/deck.cpp
+++ b/lib/deck.cpp
@@ -185,10 +185,15 @@ unsigned int deck :: next()
 
 	for (it = playqueue_deck.begin(); it != playqueue_deck.end(); it++) {
 		if (it->get_flags() & PQ_ENABLED) {
-			id = it->next();
 			if (it->size() == 0) {
 				playqueue_deck.erase(it);
 				get_callbacks()->on_pq_removed(&(*it));
+			} else {
+				id = it->next();
+				if (it->size() == 0) {
+					playqueue_deck.erase(it);
+					get_callbacks()->on_pq_removed(&(*it));
+				}
 			}
 			write();
 			return id;