Fix SwitchOnFirst
hanging subscription
#3939
Merged
SwitchOnFirst
hanging subscription
#3939