diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp
index 9b6bf89b1..7458db5f7 100644
--- a/src/gui/upnpbrowser.cpp
+++ b/src/gui/upnpbrowser.cpp
@@ -731,7 +731,7 @@ bool CUpnpBrowserGui::selectItem(std::string id)
 	if (!getItems(id, liststart, entries, total))
 		return endall;
 
-	while (loop) {
+	while (loop && entries!=NULL) {
 		updateTimes();
 		updateMode();