diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index d86a50f09646e369c75b7aaeb7fad4bc07966ca9..574c5e0182cf0b8f30a26dc2a3c6de52d384d4a3 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1045,6 +1045,7 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work)
 			struct nvme_rdma_ctrl, err_work);
 
 	nvme_stop_keep_alive(&ctrl->ctrl);
+	flush_work(&ctrl->ctrl.async_event_work);
 	nvme_rdma_teardown_io_queues(ctrl, false);
 	nvme_start_queues(&ctrl->ctrl);
 	nvme_rdma_teardown_admin_queue(ctrl, false);