diff --git a/src/vppinfra/bitmap.h b/src/vppinfra/bitmap.h
index d6dfe86..0e94d02 100644
--- a/src/vppinfra/bitmap.h
+++ b/src/vppinfra/bitmap.h
@@ -728,6 +728,9 @@
 	  if (t)
 	    return log2_first_set (t) + i0 * BITS (ai[0]);
 	}
+
+      /* no clear bit left in bitmap, return bit just beyond bitmap */
+      return (i0 + 1) * BITS (ai[0]);
     }
   return i;
 }