diff --git a/cmd/arglist.c b/cmd/arglist.c
index 3b3f617..bf7b598 100644
--- a/cmd/arglist.c
+++ b/cmd/arglist.c
@@ -921,6 +921,10 @@ bool b_arglist_iterator_next(struct b_arglist_iterator *it)
 		}
 
 		b_btree_iterator_begin(&opt->opt_values, &it->_arg_it);
+
+		if (it->_arg_filter == B_COMMAND_INVALID_ID) {
+			return true;
+		}
 	}
 }