diff --git a/src/main/java/li/cil/circuity/vm/riscv/R5Board.java b/src/main/java/li/cil/circuity/vm/riscv/R5Board.java
index b3c08c74..5c52b2b9 100644
--- a/src/main/java/li/cil/circuity/vm/riscv/R5Board.java
+++ b/src/main/java/li/cil/circuity/vm/riscv/R5Board.java
@@ -108,7 +108,6 @@ public final class R5Board {
             steppableDevices.add((Steppable) device);
         }
 
-        reset();
         return true;
     }
 
@@ -137,8 +136,6 @@ public final class R5Board {
         if (device instanceof Steppable) {
             steppableDevices.remove(device);
         }
-
-        reset();
     }
 
     public void reset() {