Make sure required feature is available regardless of connection state.

Make sure required feature is available regardless of connection state. #6269