diff --git a/lib/nvmf/request.c b/lib/nvmf/request.c
index 6365f9bbf..18ef4283b 100644
--- a/lib/nvmf/request.c
+++ b/lib/nvmf/request.c
@@ -69,8 +69,9 @@ spdk_nvmf_request_complete(struct spdk_nvmf_request *req)
 {
 	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
 
-	if (cmd->opc == SPDK_NVME_OPC_FABRIC ||
-	    req->qpair->type == QPAIR_TYPE_AQ) {
+	if ((cmd->opc == SPDK_NVME_OPC_FABRIC ||
+	     req->qpair->type == QPAIR_TYPE_AQ) &&
+	    req->qpair->thread) {
 		/* Pass a message back to the originating thread. */
 		spdk_thread_send_msg(req->qpair->thread,
 				     spdk_nvmf_request_complete_on_qpair,