diff --git a/src/db/upnp/ContentDirectoryService.cxx b/src/db/upnp/ContentDirectoryService.cxx
index d4e5fec59..3bf6e159d 100644
--- a/src/db/upnp/ContentDirectoryService.cxx
+++ b/src/db/upnp/ContentDirectoryService.cxx
@@ -123,6 +123,9 @@ ContentDirectoryService::readDir(UpnpClient_Handle handle,
 				  count, total, error))
 			return false;
 
+		if (count == 0)
+			return true;
+
 		offset += count;
 	}