diff --git a/core/MenuManager.cpp b/core/MenuManager.cpp
index 31b234e0..2febf988 100644
--- a/core/MenuManager.cpp
+++ b/core/MenuManager.cpp
@@ -262,7 +262,7 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 	 */
 	unsigned int i = startItem;
 	unsigned int foundItems = 0;
-	while (true)
+	while (totalItems)
 	{
 		ItemDrawInfo &dr = drawItems[foundItems].draw;
 		/* Is the item valid? */