issue #21189: do not always requery
Merge pull request #800 from shackbarth/21189

issue #21189: do not always requery