diff --git a/htc/htc.c b/htc/htc.c
index c955433b9b..8d07d218fb 100644
--- a/htc/htc.c
+++ b/htc/htc.c
@@ -526,8 +526,7 @@ static void reset_endpoint_states(HTC_TARGET *target)
 		INIT_HTC_PACKET_QUEUE(&pEndpoint->TxLookupQueue);
 		INIT_HTC_PACKET_QUEUE(&pEndpoint->RxBufferHoldQueue);
 		pEndpoint->target = target;
-		/* pEndpoint->TxCreditFlowEnabled = (A_BOOL)htc_credit_flow; */
-		pEndpoint->TxCreditFlowEnabled = (A_BOOL) 1;
+		pEndpoint->TxCreditFlowEnabled = (A_BOOL)htc_credit_flow;
 		qdf_atomic_init(&pEndpoint->TxProcessCount);
 	}
 }
diff --git a/htc/htc_services.c b/htc/htc_services.c
index 463e948e7d..2b29b1a85c 100644
--- a/htc/htc_services.c
+++ b/htc/htc_services.c
@@ -126,17 +126,11 @@ A_STATUS htc_connect_service(HTC_HANDLE HTCHandle,
 			    HTC_CONNECT_FLAGS_DISABLE_CREDIT_FLOW_CTRL) {
 				disableCreditFlowCtrl = true;
 			}
-#if defined(HIF_USB)
+
 			if (!htc_credit_flow) {
 				disableCreditFlowCtrl = true;
 			}
-#else
-			/* Only enable credit for WMI service */
-			if (!htc_credit_flow
-			    && pConnectReq->service_id != WMI_CONTROL_SVC) {
-				disableCreditFlowCtrl = true;
-			}
-#endif
+
 			/* check caller if it wants to transfer meta data */
 			if ((pConnectReq->pMetaData != NULL) &&
 			    (pConnectReq->MetaDataLength <=