diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c
index 170357a07c..fef8e8aac3 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -252,6 +252,7 @@ int hdd_hif_open(struct device *dev, void *bdev, const struct hif_bus_id *bid,
 		ret = qdf_status_to_os_return(status);
 		goto err_hif_close;
 	} else {
+		cds_set_target_ready(true);
 		ret = hdd_napi_create();
 		hdd_debug("hdd_napi_create returned: %d", ret);
 		if (ret == 0)
@@ -1452,9 +1453,6 @@ static void wlan_hdd_set_the_pld_uevent(struct pld_uevent_data *uevent)
 	case PLD_FW_DOWN:
 		cds_set_fw_state(CDS_FW_STATE_DOWN);
 		break;
-	case PLD_FW_READY:
-		cds_set_target_ready(true);
-		break;
 	}
 }
 
@@ -1489,7 +1487,6 @@ static void wlan_hdd_handle_the_pld_uevent(struct pld_uevent_data *uevent)
 			wlan_cfg80211_cleanup_scan_queue(
 					hdd_ctx->hdd_pdev);
 		break;
-	case PLD_FW_READY:
 	default:
 		break;
 	}
diff --git a/core/pld/inc/pld_common.h b/core/pld/inc/pld_common.h
index c2a33e6d33..8083bed403 100644
--- a/core/pld/inc/pld_common.h
+++ b/core/pld/inc/pld_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -135,7 +135,6 @@ struct pld_platform_cap {
 enum pld_uevent {
 	PLD_RECOVERY,
 	PLD_FW_DOWN,
-	PLD_FW_READY,
 };
 
 /**
diff --git a/core/pld/src/pld_snoc.c b/core/pld/src/pld_snoc.c
index c70a3d021a..ffdd95190c 100644
--- a/core/pld/src/pld_snoc.c
+++ b/core/pld/src/pld_snoc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -263,10 +263,6 @@ static int pld_snoc_uevent(struct device *dev,
 		data.uevent = PLD_FW_DOWN;
 		data.fw_down.crashed = uevent_data->crashed;
 		break;
-	case ICNSS_UEVENT_FW_READY:
-		data.uevent = PLD_FW_READY;
-		break;
-
 	default:
 		goto out;
 	}