diff --git a/components/nan/core/src/nan_main.c b/components/nan/core/src/nan_main.c
index 9687f83c5c..c73c4383ab 100644
--- a/components/nan/core/src/nan_main.c
+++ b/components/nan/core/src/nan_main.c
@@ -1259,13 +1259,13 @@ static QDF_STATUS nan_discovery_generic_req(struct nan_generic_req *req)
 	return tx_ops->nan_discovery_req_tx(req, NAN_GENERIC_REQ);
 }
 
-void nan_discovery_flush_callback(struct scheduler_msg *msg)
+QDF_STATUS nan_discovery_flush_callback(struct scheduler_msg *msg)
 {
 	struct wlan_objmgr_psoc *psoc;
 
 	if (!msg || !msg->bodyptr) {
 		nan_err("Null pointer for NAN Discovery message");
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 
 	switch (msg->type) {
@@ -1281,11 +1281,13 @@ void nan_discovery_flush_callback(struct scheduler_msg *msg)
 	default:
 		nan_err("Unsupported request type: %d", msg->type);
 		qdf_mem_free(msg->bodyptr);
-		return;
+		return QDF_STATUS_E_INVAL;
 	}
 
 	wlan_objmgr_psoc_release_ref(psoc, WLAN_NAN_ID);
 	qdf_mem_free(msg->bodyptr);
+
+	return QDF_STATUS_SUCCESS;
 }
 
 QDF_STATUS nan_discovery_scheduled_handler(struct scheduler_msg *msg)
diff --git a/components/nan/core/src/nan_main_i.h b/components/nan/core/src/nan_main_i.h
index 07fc44532e..b133eb54cc 100644
--- a/components/nan/core/src/nan_main_i.h
+++ b/components/nan/core/src/nan_main_i.h
@@ -186,9 +186,9 @@ QDF_STATUS nan_scheduled_msg_handler(struct scheduler_msg *msg);
  * nan_discovery_flush_callback: callback to flush the NAN scheduler msg
  * @msg: pointer to msg
  *
- * Return: None
+ * Return: QDF_STATUS
  */
-void nan_discovery_flush_callback(struct scheduler_msg *msg);
+QDF_STATUS nan_discovery_flush_callback(struct scheduler_msg *msg);
 
 /**
  * nan_discovery_scheduled_handler: callback pointer to be called when scheduler