diff --git a/drivers/gpu/nvgpu/os/linux/pci.c b/drivers/gpu/nvgpu/os/linux/pci.c
index 857aa819f..18f4d1191 100644
--- a/drivers/gpu/nvgpu/os/linux/pci.c
+++ b/drivers/gpu/nvgpu/os/linux/pci.c
@@ -762,6 +762,10 @@ static void nvgpu_pci_remove(struct pci_dev *pdev)
 		nvgpu_thermal_deinit(g);
 	}
 
+	err = nvgpu_quiesce(g);
+	/* TODO: handle failure to idle */
+	WARN(err, "gpu failed to idle during driver removal");
+
 	nvgpu_free_irq(g);
 
 	nvgpu_remove(dev);