diff --git a/src/amd/compiler/aco_interface.cpp b/src/amd/compiler/aco_interface.cpp
index fb4e458ab24..df538491876 100644
--- a/src/amd/compiler/aco_interface.cpp
+++ b/src/amd/compiler/aco_interface.cpp
@@ -130,7 +130,7 @@ aco_postprocess_shader(const struct aco_compiler_options* options,
    /* Register Allocation */
    register_allocation(program.get());
 
-   if (validate_ra(program.get())) {
+   if ((debug_flags & DEBUG_VALIDATE_RA) && validate_ra(program.get())) {
       aco_print_program(program.get(), stderr);
       abort();
    } else if (options->dump_ir) {
diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp
index bfbb91e3cf5..9a6bd76b1cf 100644
--- a/src/amd/compiler/aco_validate.cpp
+++ b/src/amd/compiler/aco_validate.cpp
@@ -1550,9 +1550,6 @@ validate_instr_defs(Program* program, std::array<unsigned, 2048>& regs,
 bool
 validate_ra(Program* program)
 {
-   if (!(debug_flags & DEBUG_VALIDATE_RA))
-      return false;
-
    bool err = false;
    aco::live_var_analysis(program);
    std::vector<std::vector<Temp>> phi_sgpr_ops(program->blocks.size());