diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h
index 26f7891abf..d578d5665e 100644
--- a/core/cds/inc/cds_api.h
+++ b/core/cds/inc/cds_api.h
@@ -207,25 +207,6 @@ static inline bool cds_is_module_stop_in_progress(void)
 	return __CDS_IS_DRIVER_STATE(state, CDS_DRIVER_STATE_MODULE_STOPPING);
 }
 
-/**
- * cds_is_module_state_transitioning() - Is module state transitioning
- *
- * Return: true if module stop is in progress.
- */
-static inline int cds_is_module_state_transitioning(void)
-{
-	if (cds_is_load_or_unload_in_progress() || cds_is_driver_recovering() ||
-		cds_is_module_stop_in_progress()) {
-		pr_info("%s: Load/Unload %d or recovery %d or module_stop %d is in progress",
-			__func__, cds_is_load_or_unload_in_progress(),
-				cds_is_driver_recovering(),
-				cds_is_module_stop_in_progress());
-		return true;
-	} else {
-		return false;
-	}
-}
-
 /**
  * cds_is_fw_down() - Is FW down or not
  *
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index cad7abfedf..6ab9ba209a 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -190,8 +190,6 @@ QDF_STATUS cds_init(void)
 	qdf_register_fw_down_callback(cds_is_fw_down);
 	qdf_register_ssr_protect_callbacks(cds_ssr_protect,
 					   cds_ssr_unprotect);
-	qdf_register_module_state_query_callback(
-				cds_is_module_state_transitioning);
 
 	gp_cds_context = &g_cds_context;
 
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 8be506b1b1..43a2030d53 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -12356,6 +12356,11 @@ static void hdd_qdf_print_deinit(void)
 	qdf_print_ctrl_cleanup(qdf_print_idx);
 }
 
+static inline int hdd_state_query_cb(void)
+{
+	return !!wlan_hdd_validate_context(cds_get_context(QDF_MODULE_ID_HDD));
+}
+
 /**
  * hdd_init() - Initialize Driver
  *
@@ -12376,6 +12381,7 @@ int hdd_init(void)
 		ret = -ENOMEM;
 		goto err_out;
 	}
+	qdf_register_module_state_query_callback(hdd_state_query_cb);
 
 	wlan_init_bug_report_lock();