diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c
index 806a44e1867..f154bd08a09 100644
--- a/src/amd/vulkan/radv_physical_device.c
+++ b/src/amd/vulkan/radv_physical_device.c
@@ -124,13 +124,8 @@ radv_video_encode_queue_enabled(const struct radv_physical_device *pdev)
 bool
 radv_compute_queue_enabled(const struct radv_physical_device *pdev)
 {
-   /* Compute queues may run compute dispatches in parallel with
-    * the graphics queue, even from other processes/apps.
-    * At the moment we can't make sure that all compute shaders
-    * use a workgroup size of 256 to mitigate the regalloc hang,
-    * so disable compute queues on affected chips.
-    */
-   if (pdev->info.has_cs_regalloc_hang_bug)
+   /* Compute queues may hang on GFX6, need further investigation before enabling them. */
+   if (pdev->info.gfx_level == GFX6)
       return false;
 
    const struct radv_instance *instance = radv_physical_device_instance(pdev);