diff --git a/src/amd/vulkan/layers/radv_sqtt_layer.c b/src/amd/vulkan/layers/radv_sqtt_layer.c
index 079cce65b70..11775d66892 100644
--- a/src/amd/vulkan/layers/radv_sqtt_layer.c
+++ b/src/amd/vulkan/layers/radv_sqtt_layer.c
@@ -512,10 +512,6 @@ radv_handle_thread_trace(VkQueue _queue)
       radv_end_thread_trace(queue);
       thread_trace_enabled = false;
 
-      if (!radv_device_set_pstate(queue->device, false)) {
-         fprintf(stderr, "radv: Failed to restore previous pstate, ignoring.\n");
-      }
-
       /* TODO: Do something better than this whole sync. */
       queue->device->vk.dispatch_table.QueueWaitIdle(_queue);
 
@@ -551,8 +547,7 @@ radv_handle_thread_trace(VkQueue _queue)
 #endif
 
       if (frame_trigger || file_trigger || resize_trigger) {
-         if (!radv_device_set_pstate(queue->device, true) ||
-             ac_check_profile_state(&queue->device->physical_device->rad_info)) {
+         if (ac_check_profile_state(&queue->device->physical_device->rad_info)) {
             fprintf(stderr, "radv: Canceling RGP trace request as a hang condition has been "
                             "detected. Force the GPU into a profiling mode with e.g. "
                             "\"echo profile_peak  > "
diff --git a/src/amd/vulkan/radv_sqtt.c b/src/amd/vulkan/radv_sqtt.c
index 28298981701..270af5be507 100644
--- a/src/amd/vulkan/radv_sqtt.c
+++ b/src/amd/vulkan/radv_sqtt.c
@@ -526,6 +526,9 @@ radv_thread_trace_init(struct radv_device *device)
    if (!radv_thread_trace_init_bo(device))
       return false;
 
+   if (!radv_device_acquire_performance_counters(device))
+      return false;
+
    list_inithead(&thread_trace_data->rgp_pso_correlation.record);
    simple_mtx_init(&thread_trace_data->rgp_pso_correlation.lock, mtx_plain);