diff --git a/src/ARMJIT.cpp b/src/ARMJIT.cpp
index 3b6bc2e9..5d92e47c 100644
--- a/src/ARMJIT.cpp
+++ b/src/ARMJIT.cpp
@@ -163,6 +163,7 @@ CompiledBlock CompileBlock(ARM* cpu)
     {
         r15 += thumb ? 2 : 4;
 
+		instrs[i].SetFlags = 0;
         instrs[i].Instr = nextInstr[0];
         instrs[i].NextInstr[0] = nextInstr[0] = nextInstr[1];
 
diff --git a/src/ARMJIT_x64/ARMJIT_ALU.cpp b/src/ARMJIT_x64/ARMJIT_ALU.cpp
index 6a7d711d..f868ddfb 100644
--- a/src/ARMJIT_x64/ARMJIT_ALU.cpp
+++ b/src/ARMJIT_x64/ARMJIT_ALU.cpp
@@ -387,7 +387,7 @@ void Compiler::Comp_RetriveFlags(bool sign, bool retriveCV, bool carryUsed)
         AND(32, R(RCPSR), Imm32(0x3FFFFFFF & ~(carryUsed << 29) & ~((retriveCV ? 3 : 0) << 28)));
         OR(32, R(RCPSR), R(RSCRATCH));
     }
-    else
+    else if (carryUsed || retriveCV)
     {
         SHL(32, R(RSCRATCH2), Imm8(carryOnly ? 29 : 28));
         AND(32, R(RCPSR), Imm32(0xFFFFFFFF & ~(carryUsed << 29) & ~((retriveCV ? 3 : 0) << 28)));
diff --git a/src/ARM_InstrInfo.cpp b/src/ARM_InstrInfo.cpp
index ea6d8276..3634c351 100644
--- a/src/ARM_InstrInfo.cpp
+++ b/src/ARM_InstrInfo.cpp
@@ -436,7 +436,7 @@ Info Decode(bool thumb, u32 num, u32 instr)
         if ((instr >> 28) < 0xE)
         {
             // make non conditional flag sets conditional
-            res.WriteFlags = res.WriteFlags | (res.WriteFlags << 4);
+            res.WriteFlags = (res.WriteFlags | (res.WriteFlags << 4)) & 0xF0;
             res.ReadFlags |= FlagsReadPerCond[instr >> 29];
         }