diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index 26ce63b46..5cafe5c17 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -767,12 +767,8 @@ spdk_nvmf_qpair_disconnect(struct spdk_nvmf_qpair *qpair, nvmf_qpair_disconnect_
 	qpair_ctx->cb_fn = cb_fn;
 	qpair_ctx->thread = qpair->group->thread;
 	qpair_ctx->ctx = ctx;
-	if (qpair->group->thread == spdk_get_thread()) {
-		_spdk_nvmf_qpair_deactivate(qpair_ctx);
-	} else {
-		/* Send a message to the thread that owns this qpair */
-		spdk_thread_send_msg(qpair->group->thread, _spdk_nvmf_qpair_deactivate, qpair_ctx);
-	}
+	/* Send a message to the thread that owns this qpair */
+	spdk_thread_send_msg(qpair->group->thread, _spdk_nvmf_qpair_deactivate, qpair_ctx);
 	return 0;
 }