Hello RZimmer
You are doing nothing wrong, i have been able to replicate this behavior on my side as well. We are working internally to address this.
For now on, my advise will be to create a separate task for new machines and not adding devices to the first one.
Thanks !