fix(storage): make storage robust to edge case on region selection

fix(storage): make storage robust to edge case on region selection #614