diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 62244902a47..9310ec4989e 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2830,14 +2830,16 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
 			if (!aco)
 				NIR_PASS_V(nir[i], nir_lower_bool_to_int32);
 		}
-
-		if (radv_can_dump_shader(device, modules[i], false))
-			nir_print_shader(nir[i], stderr);
 	}
 
 	if (nir[MESA_SHADER_FRAGMENT])
 		radv_lower_fs_io(nir[MESA_SHADER_FRAGMENT]);
 
+	for (int i = 0; i < MESA_SHADER_STAGES; ++i) {
+		if (radv_can_dump_shader(device, modules[i], false))
+			nir_print_shader(nir[i], stderr);
+	}
+
 	radv_fill_shader_keys(device, keys, key, nir);
 
 	radv_fill_shader_info(pipeline, pStages, keys, infos, nir);