diff --git a/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java b/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java
index 296e6756..402d99db 100644
--- a/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java
+++ b/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java
@@ -95,6 +95,9 @@ public final class RPCDeviceBusAdapter implements Steppable, IEventSink {
     }
 
     public void disposeDevices() {
+        for (RPCEventSource res: subscriptions) {
+            res.unsubscribe(this);
+        }
         unmountDevices();
 
         unmountedDevices.forEach(RPCDeviceList::dispose);