Properly guard optional config property
Remove unnecessary guard