diff --git a/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java
index 9ae38e1c..c4263b5c 100644
--- a/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java
@@ -371,6 +371,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic
         }
 
         if (hdd != null) {
+            virtualMachine.board.removeDevice(hdd);
             try {
                 hdd.close();
             } catch (final IOException e) {