Merge pull request #2220 from headlamp-k8s/remove-if-env

Merge pull request #2220 from headlamp-k8s/remove-if-env #4299