Use state value where available