diff --git a/src/main/java/li/cil/oc2/common/bus/AbstractGroupingDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/AbstractGroupingDeviceBusElement.java
index da01d1fc..03b3ff9d 100644
--- a/src/main/java/li/cil/oc2/common/bus/AbstractGroupingDeviceBusElement.java
+++ b/src/main/java/li/cil/oc2/common/bus/AbstractGroupingDeviceBusElement.java
@@ -94,6 +94,9 @@ public abstract class AbstractGroupingDeviceBusElement extends AbstractDeviceBus
         addedDevices.removeAll(oldDevices);
         devices.addAll(addedDevices);
 
+        oldDevices.removeAll(removedDevices);
+        oldDevices.addAll(newDevices);
+
         final CompoundNBT devicesNbt = deviceData[index];
         for (final Device device : removedDevices) {
             device.getSerializationKey().ifPresent(key ->