diff --git a/drivers/soc/qcom/icnss2/main.c b/drivers/soc/qcom/icnss2/main.c
index 571df002f809..d7a3ff4969af 100644
--- a/drivers/soc/qcom/icnss2/main.c
+++ b/drivers/soc/qcom/icnss2/main.c
@@ -2339,6 +2339,12 @@ int icnss_force_wake_request(struct device *dev)
 		return -EINVAL;
 	}
 
+	if (atomic_read(&priv->soc_wake_ref_count)) {
+		count = atomic_inc_return(&priv->soc_wake_ref_count);
+		icnss_pr_dbg("SOC already awake, Ref count: %d", count);
+		return 0;
+	}
+
 	icnss_pr_dbg("Calling SOC Wake request");
 
 	if (atomic_read(&priv->soc_wake_ref_count)) {
@@ -2357,6 +2363,7 @@ EXPORT_SYMBOL(icnss_force_wake_request);
 int icnss_force_wake_release(struct device *dev)
 {
 	struct icnss_priv *priv = dev_get_drvdata(dev);
+	int count = 0;
 
 	if (!dev)
 		return -ENODEV;
@@ -2366,6 +2373,13 @@ int icnss_force_wake_release(struct device *dev)
 		return -EINVAL;
 	}
 
+	if (atomic_read(&priv->soc_wake_ref_count) > 1) {
+		count = atomic_dec_return(&priv->soc_wake_ref_count);
+		icnss_pr_dbg("SOC previous release pending, Ref count: %d",
+			     count);
+		return 0;
+	}
+
 	icnss_pr_dbg("Calling SOC Wake response");
 
 	icnss_soc_wake_event_post(priv, ICNSS_SOC_WAKE_RELEASE_EVENT,