diff --git a/compiler/riscv/aoptcpurv.pas b/compiler/riscv/aoptcpurv.pas
index 380933bf29..f06d913edd 100644
--- a/compiler/riscv/aoptcpurv.pas
+++ b/compiler/riscv/aoptcpurv.pas
@@ -607,7 +607,9 @@ implementation
                       RemoveInstr(p);
 
                       result:=true;
-                    end;
+                    end
+                  else
+                    result:=OptPass1OP(p);
                 end;
               A_SLTIU:
                 begin
@@ -673,8 +675,8 @@ implementation
               A_MULH,
               A_MULHSU,
               A_MULHU,
-              A_XORI,
               A_ORI,
+              A_XORI,
               A_AND,
               A_OR,
               A_XOR,