diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index 998853eec11b..acfae2518ce4 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -268,7 +268,6 @@ QDF_STATUS cds_open(void)
 		goto err_sched_close;
 	}
 
-	hdd_update_config(pHddCtx);
 	cds_cfg = cds_get_ini_config();
 	if (!cds_cfg) {
 		cds_err("Cds config is NULL");
@@ -2191,7 +2190,7 @@ void cds_deinit_ini_config(void)
 		return;
 	}
 
-	if (!cds_ctx->cds_cfg)
+	if (cds_ctx->cds_cfg)
 		qdf_mem_free(cds_ctx->cds_cfg);
 
 	cds_ctx->cds_cfg = NULL;
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 2a0510c4d1b6..c9251c4a7c0b 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -1731,6 +1731,12 @@ int hdd_wlan_start_modules(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
 			goto hif_close;
 		}
 
+		ret = hdd_update_config(hdd_ctx);
+		if (ret) {
+			hdd_err("Failed to update configuration :%d", ret);
+			goto ol_cds_free;
+		}
+
 		status = cds_open();
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
 			hdd_err("Failed to Open CDS: %d", status);
@@ -7384,10 +7390,6 @@ int hdd_wlan_startup(struct device *dev)
 
 	hdd_wlan_green_ap_init(hdd_ctx);
 
-	ret = hdd_update_config(hdd_ctx);
-	if (ret)
-		goto err_exit_nl_srv;
-
 	ret = hdd_wlan_start_modules(hdd_ctx, adapter, false);
 	if (ret) {
 		hdd_alert("Failed to start modules: %d", ret);