diff --git a/hif/inc/hif.h b/hif/inc/hif.h
index a2be7deba8..3a49d9dab3 100644
--- a/hif/inc/hif.h
+++ b/hif/inc/hif.h
@@ -430,7 +430,7 @@ void hif_get_hw_info(struct hif_opaque_softc *scn, u32 *version, u32 *revision,
 void hif_disable_isr(struct hif_opaque_softc *scn);
 void hif_reset_soc(struct hif_opaque_softc *scn);
 void hif_save_htc_htt_config_endpoint(struct hif_opaque_softc *hif_ctx,
-				      int htc_endpoint);
+				      int htc_htt_tx_endpoint);
 struct hif_opaque_softc *hif_open(qdf_device_t qdf_ctx, uint32_t mode,
 				  enum qdf_bus_type bus_type,
 				  struct hif_driver_state_callbacks *cbk);
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index 9ac17b4c1c..9f5d445cc4 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -1588,9 +1588,9 @@ void hif_send_buffer_cleanup_on_pipe(struct HIF_CE_pipe_info *pipe_info)
 			 * by checking whether it's the endpoint
 			 * which they are queued in.
 			 */
-			if (id == scn->htc_endpoint)
+			if (id == scn->htc_htt_tx_endpoint)
 				return;
-			/* Indicate the completion to higer
+			/* Indicate the completion to higher
 			 * layer to free the buffer */
 			hif_state->msg_callbacks_current.
 			txCompletionHandler(hif_state->
diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c
index 99748c0328..05b7c8edce 100644
--- a/hif/src/hif_main.c
+++ b/hif/src/hif_main.c
@@ -333,14 +333,14 @@ qdf_size_t init_buffer_count(qdf_size_t maxSize)
 }
 
 /**
- * hif_save_htc_htt_config_endpoint():
- * hif_save_htc_htt_config_endpoint
- * @htc_endpoint: htc_endpoint
+ * hif_save_htc_htt_config_endpoint() - save htt_tx_endpoint
+ * @hif_ctx: hif context
+ * @htc_htt_tx_endpoint: htt_tx_endpoint
  *
  * Return: void
  */
 void hif_save_htc_htt_config_endpoint(struct hif_opaque_softc *hif_ctx,
-							int htc_endpoint)
+							int htc_htt_tx_endpoint)
 {
 	struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
 
@@ -350,7 +350,7 @@ void hif_save_htc_htt_config_endpoint(struct hif_opaque_softc *hif_ctx,
 		return;
 	}
 
-	scn->htc_endpoint = htc_endpoint;
+	scn->htc_htt_tx_endpoint = htc_htt_tx_endpoint;
 }
 
 /**
diff --git a/hif/src/hif_main.h b/hif/src/hif_main.h
index d2f7378bbf..620f22439e 100644
--- a/hif/src/hif_main.h
+++ b/hif/src/hif_main.h
@@ -140,7 +140,7 @@ struct hif_softc {
 	int linkstate_vote;
 	bool fastpath_mode_on;
 	atomic_t tasklet_from_intr;
-	int htc_endpoint;
+	int htc_htt_tx_endpoint;
 	qdf_dma_addr_t mem_pa;
 	bool athdiag_procfs_inited;
 #ifdef FEATURE_NAPI
diff --git a/htc/htc_services.c b/htc/htc_services.c
index 932bf70fa7..57be7cf350 100644
--- a/htc/htc_services.c
+++ b/htc/htc_services.c
@@ -332,10 +332,6 @@ A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 
 	} while (false);
 
-	if (HTT_SERVICE_GROUP == (pConnectReq->service_id >> 8))
-		hif_save_htc_htt_config_endpoint(target->hif_dev,
-						 assignedEndpoint);
-
 	AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-htc_connect_service\n"));
 
 	return status;