diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index 2410a8af8aa0..e9578f01a79c 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -531,8 +531,7 @@ QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc)
 	}
 
 	/*Open the WMA module */
-	qdf_status = wma_open(psoc, gp_cds_context,
-			      hdd_update_tgt_cfg, cds_cfg);
+	qdf_status = wma_open(psoc, hdd_update_tgt_cfg, cds_cfg);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		/* Critical Error ...  Cannot proceed further */
diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h
index 0bfc7905d399..62949d44771d 100644
--- a/core/wma/inc/wma_types.h
+++ b/core/wma/inc/wma_types.h
@@ -713,7 +713,7 @@ QDF_STATUS wma_tx_packet(void *pWMA,
 			 uint8_t txFlag, uint8_t sessionId, bool tdlsflag,
 			 uint16_t channel_freq);
 
-QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc, void *p_cds_context,
+QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
 		    wma_tgt_cfg_cb pTgtUpdCB, struct cds_config_info *cds_cfg);
 
 /**
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index bbcdff337947..5f57fb6cd799 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -2208,13 +2208,12 @@ void wma_vdev_deinit(struct wma_txrx_node *vdev)
 /**
  * wma_open() - Allocate wma context and initialize it.
  * @psoc: Psoc pointer
- * @cds_context:  cds context
  * @wma_tgt_cfg_cb: tgt config callback fun
  * @cds_cfg:  mac parameters
  *
  * Return: 0 on success, errno on failure
  */
-QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc, void *cds_context,
+QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
 		    wma_tgt_cfg_cb tgt_cfg_cb,
 		    struct cds_config_info *cds_cfg)
 {
@@ -2228,9 +2227,16 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc, void *cds_context,
 	struct target_psoc_info *tgt_psoc_info;
 	bool use_cookie = false;
 	int i;
+	void *cds_context;
 
 	WMA_LOGD("%s: Enter", __func__);
 
+	cds_context = cds_get_global_context();
+	if (!cds_context) {
+		WMA_LOGE("%s: Invalid CDS context", __func__);
+		return QDF_STATUS_E_INVAL;
+	}
+
 	g_wmi_version_info.major = __WMI_VER_MAJOR_;
 	g_wmi_version_info.minor = __WMI_VER_MINOR_;
 	g_wmi_version_info.revision = __WMI_REVISION_;