diff --git a/Server/src/main/java/net/simon987/server/webserver/CodeUploadHandler.java b/Server/src/main/java/net/simon987/server/webserver/CodeUploadHandler.java
index 8400a93..2a9d162 100644
--- a/Server/src/main/java/net/simon987/server/webserver/CodeUploadHandler.java
+++ b/Server/src/main/java/net/simon987/server/webserver/CodeUploadHandler.java
@@ -40,6 +40,8 @@ public class CodeUploadHandler implements MessageHandler {
                         user.getUser().getControlledUnit().getKeyboardBuffer().clear();
                     }
 
+                    //Clear registers
+                    user.getUser().getCpu().getRegisterSet().clear();
 
                     JSONObject response = new JSONObject();
                     response.put("t", "codeResponse");