diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java b/Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java
index 3b86d05..62747e1 100644
--- a/Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java
+++ b/Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java
@@ -46,9 +46,11 @@ public class MulInstruction extends Instruction {
             status.setOverflowFlag(true);
             status.setCarryFlag(true);
             cpu.getRegisterSet().getRegister("Y").setValue(hWord);//Don't overwrite Y register if it's blank
+        } else {
+            status.setOverflowFlag(false);
+            status.setCarryFlag(false);
         }
-        status.setOverflowFlag(false);
-        status.setCarryFlag(false);
+
         cpu.getRegisterSet().getRegister("A").setValue(Util.getLowerWord(result));
 
         return status;