Workaround for grid deselect bug?

Is there any better workaround for https://github.com/vaadin/vaadin-grid-flow/issues/713 than keeping track of the last selection and putting it back if the selection is empty in the listener?