diff --git a/kernel-open/nvidia-uvm/uvm_global.c b/kernel-open/nvidia-uvm/uvm_global.c
index fcf7d4865d..9a59208937 100644
--- a/kernel-open/nvidia-uvm/uvm_global.c
+++ b/kernel-open/nvidia-uvm/uvm_global.c
@@ -335,7 +335,8 @@ static NV_STATUS uvm_suspend(void)
 
         uvm_parent_gpu_set_isr_suspended(gpu->parent, true);
 
-        nv_kthread_q_flush(&gpu->parent->isr.bottom_half_q);
+        if (gpu->parent->isr.replayable_faults.handling)
+            nv_kthread_q_flush(&gpu->parent->isr.bottom_half_q);
 
         if (gpu->parent->isr.non_replayable_faults.handling)
             nv_kthread_q_flush(&gpu->parent->isr.kill_channel_q);