LPS-39718 Remove default values to prevent unreachable code
LPS-39718 Fix fallback condition