Fix FORGE-1735 : List of commands sometimes shows up Empty