diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c
index a414c8397f8840902a87581d080887a6aa6e0cba..caa467dc835141dfa3d6af43217fc6f4fec90a92 100644
--- a/drivers/hv/hv_kvp.c
+++ b/drivers/hv/hv_kvp.c
@@ -621,6 +621,7 @@ void hv_kvp_onchannelcallback(void *context)
 		kvp_transaction.kvp_context = context;
 		return;
 	}
+	kvp_transaction.kvp_context = NULL;
 
 	vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE * 4, &recvlen,
 			 &requestid);