diff --git a/src/lib/menu.c b/src/lib/menu.c
index 386eaf38a..a58dbb5b6 100644
--- a/src/lib/menu.c
+++ b/src/lib/menu.c
@@ -351,12 +351,16 @@ section_width(const ncmenu* n, int sectionidx){
 }
 
 int ncmenu_unroll(ncmenu* n, int sectionidx){
-  if(sectionidx < 0 || sectionidx >= n->sectioncount){
+  if(ncmenu_rollup(n)){ // roll up any unrolled section
     return -1;
   }
-  if(ncmenu_rollup(n)){ // roll up any unrolled section
+  if(sectionidx < 0 || sectionidx >= n->sectioncount){
+    logerror(n->ncp->nc, "Unrolled invalid sectionidx %d\n", sectionidx);
     return -1;
   }
+  if(n->sections[sectionidx].enabled_item_count <= 0){
+    return 0;
+  }
   if(n->sections[sectionidx].name == NULL){
     return -1;
   }