diff --git a/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx b/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx
index 3da5a8591..20f8ea5db 100644
--- a/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx
+++ b/src/components/AdvanceAnalyticsV2/AnalyticsV2Page.jsx
@@ -43,7 +43,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
id="advance.analytics.data.refresh.msg"
defaultMessage="Data updated on {date}"
description="Data refresh message"
- values={{ date: data?.lastUpdatedAt || '' }}
+ values={{ date: data?.lastUpdatedAt || currentDate }}
/>
@@ -64,6 +64,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
value={startDate || data?.minEnrollmentDate}
min={data?.minEnrollmentDate}
onChange={(e) => setStartDate(e.target.value)}
+ disabled={isFetching}
/>
@@ -81,6 +82,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
value={endDate || currentDate}
max={currentDate}
onChange={(e) => setEndDate(e.target.value)}
+ disabled={isFetching}
/>
@@ -97,6 +99,7 @@ const AnalyticsV2Page = ({ enterpriseId }) => {
as="select"
value={granularity}
onChange={(e) => setGranularity(e.target.value)}
+ disabled={isFetching}
>