diff --git a/Dashboard/SettingsWindow.xaml b/Dashboard/SettingsWindow.xaml
index 03ed9092..c7f21f33 100644
--- a/Dashboard/SettingsWindow.xaml
+++ b/Dashboard/SettingsWindow.xaml
@@ -58,9 +58,12 @@
                             <TextBlock Text="Show data from last:" VerticalAlignment="Center" Margin="0,0,10,0"/>
                             <ComboBox x:Name="DefaultTimeRangeComboBox" Width="120" SelectionChanged="DefaultTimeRangeComboBox_Changed">
                                 <ComboBoxItem Content="1 hour" Tag="1"/>
-                                <ComboBoxItem Content="6 hours" Tag="6"/>
+                                <ComboBoxItem Content="4 hours" Tag="4"/>
+                                <ComboBoxItem Content="8 hours" Tag="8"/>
+                                <ComboBoxItem Content="12 hours" Tag="12"/>
                                 <ComboBoxItem Content="24 hours" Tag="24"/>
                                 <ComboBoxItem Content="7 days" Tag="168"/>
+                                <ComboBoxItem Content="30 days" Tag="720"/>
                             </ComboBox>
                         </StackPanel>
 
diff --git a/Dashboard/SettingsWindow.xaml.cs b/Dashboard/SettingsWindow.xaml.cs
index c6d4de91..56bad3e0 100644
--- a/Dashboard/SettingsWindow.xaml.cs
+++ b/Dashboard/SettingsWindow.xaml.cs
@@ -83,7 +83,7 @@ private void LoadSettings()
             // Default to 24 hours if no match
             if (DefaultTimeRangeComboBox.SelectedItem == null)
             {
-                DefaultTimeRangeComboBox.SelectedIndex = 2; // 24 hours
+                DefaultTimeRangeComboBox.SelectedIndex = 4; // 24 hours
             }
 
             // Navigation settings