diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index bc58f1da7..942e3eaf5 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -185,6 +185,8 @@ nvmf_tgt_destroy_poll_group(void *io_device, void *ctx_buf)
 
 	free(group->sgroups);
 
+	spdk_poller_unregister(&group->poller);
+
 	if (group->destroy_cb_fn) {
 		group->destroy_cb_fn(group->destroy_cb_arg, 0);
 	}
@@ -225,8 +227,6 @@ nvmf_tgt_destroy_poll_group_qpairs(struct spdk_nvmf_poll_group *group)
 		return;
 	}
 
-	spdk_poller_unregister(&group->poller);
-
 	ctx->group = group;
 	_nvmf_tgt_disconnect_next_qpair(ctx);
 }