Removing `else` so the fallbacks indeed get used
Merge pull request #2786 from Bakual/FixRouteHelper

Tracker #33011 Removing `else` so the fallbacks indeed get used