[DO NOT REVIEW] Fixes #8547 - Showing error when no env params