Avoid forcing extension on check of local select (#23439)

Avoid forcing extension on check of local select (#23439) #2457