diff --git a/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c b/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c
index 1a131ed89ee..2e35ffa33d8 100644
--- a/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c
+++ b/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c
@@ -362,6 +362,9 @@ roce_gid_delete_all_event(struct net_device *ndev)
 	dev_hold(ndev);
 	work->ndev = ndev;
 	queue_work(roce_gid_mgmt_wq, &work->work);
+
+	/* make sure job is complete before returning */
+	flush_workqueue(roce_gid_mgmt_wq);
 }
 
 static int