diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c
index 6a13844a8e..ed418863ce 100644
--- a/core/sme/src/common/sme_power_save.c
+++ b/core/sme/src/common/sme_power_save.c
@@ -383,11 +383,13 @@ QDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id,
 	status =  sme_enable_sta_ps_check(mac_ctx, session_id);
 	if (status != QDF_STATUS_SUCCESS) {
 		/*
-		 * In non associated state ps state will be disabled in FW.
-		 * Hence, return success if ps disable is requested
-		 * in disconnected state.
+		 * In non associated state driver wont handle the power save
+		 * But kernel expects return status success even
+		 * in the disconnected state.
+		 * TODO: If driver to remember the ps state to further use
+		 * after connection.
 		 */
-		if (command == SME_PS_DISABLE)
+		if (!csr_is_conn_state_connected_infra(mac_ctx, session_id))
 			status = QDF_STATUS_SUCCESS;
 		return status;
 	}