diff --git a/src/AzureOpenAIProxy.Management/Components/Pages/EventMetrics.razor b/src/AzureOpenAIProxy.Management/Components/Pages/EventMetrics.razor
index 58f2da0d..51d20313 100644
--- a/src/AzureOpenAIProxy.Management/Components/Pages/EventMetrics.razor
+++ b/src/AzureOpenAIProxy.Management/Components/Pages/EventMetrics.razor
@@ -23,7 +23,7 @@
         </MudStack>
 
         <MudIconButton Icon="@Icons.Material.Filled.Refresh" Variant="Variant.Filled" Color="Color.Primary"
-            Size="Size.Small" Style="width: 80px;" OnClick="RefreshData" />
+            Size="Size.Small" Style="width: 80px;" OnClick="RefreshData" Disabled="@IsLoading"/>
 
         <MudPaper Class="pa-10 ma-2" Elevation="1">
             <MudChart ChartType="ChartType.Line" ChartSeries="@ActiveUsersChartSeries" XAxisLabels="@ActiveUsersChartLabels" Width="100%" Height="400px">
diff --git a/src/AzureOpenAIProxy.Management/Components/Pages/EventMetrics.razor.cs b/src/AzureOpenAIProxy.Management/Components/Pages/EventMetrics.razor.cs
index f05352a2..2f33b5a0 100644
--- a/src/AzureOpenAIProxy.Management/Components/Pages/EventMetrics.razor.cs
+++ b/src/AzureOpenAIProxy.Management/Components/Pages/EventMetrics.razor.cs
@@ -40,20 +40,15 @@ public partial class EventMetrics
 
     private async Task GetData()
     {
-        if (IsLoading)
-        {
-            return;
-        }
-
         IsLoading = true;
 
-
         (AttendeeCount, RequestCount) = MetricService.GetAttendeeMetricsAsync(EventId);
         List<EventMetricsData> MetricsData = await MetricService.GetEventMetricsAsync(EventId);
         Event = await EventService.GetEventAsync(EventId);
 
         if (MetricsData is null)
         {
+            IsLoading = false;
             return;
         }