Replace undefined
selectedAddress with null
#7161
Merged
undefined
selectedAddress with null
#7161