In case there’s no other solution, there’s a neat script which can repair your flows after device remove/add actions.