diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml b/Dashboard/Controls/ResourceMetricsContent.xaml
index 9694d495..d30c14cb 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml
@@ -112,7 +112,7 @@
                         <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="5,2">
                             <Button Content="Top Waits" Click="WaitTypes_SelectAll_Click" Padding="6,2" FontSize="10" Margin="0,0,5,0"/>
                             <Button Content="Clear All" Click="WaitTypes_ClearAll_Click" Padding="6,2" FontSize="10"/>
-                            <TextBlock x:Name="WaitTypeCountText" Text="0 / 20 selected" FontSize="10" Foreground="{DynamicResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                            <TextBlock x:Name="WaitTypeCountText" Text="0 / 30 selected" FontSize="10" Foreground="{DynamicResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
                         </StackPanel>
                         <TextBox Grid.Row="2" x:Name="WaitTypeSearchBox" Margin="5,2" Height="24" FontSize="11"
                                  TextChanged="WaitTypeSearch_TextChanged"
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml.cs b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
index 119fcdc1..125dfc7b 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml.cs
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
@@ -1923,8 +1923,8 @@ private void UpdateWaitTypeCount()
         {
             if (_waitTypeItems == null || WaitTypeCountText == null) return;
             int count = _waitTypeItems.Count(x => x.IsSelected);
-            WaitTypeCountText.Text = $"{count} / 20 selected";
-            WaitTypeCountText.Foreground = count >= 20
+            WaitTypeCountText.Text = $"{count} / 30 selected";
+            WaitTypeCountText.Foreground = count >= 30
                 ? new System.Windows.Media.SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#E57373")!)
                 : (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush");
         }
diff --git a/Dashboard/Helpers/TabHelpers.cs b/Dashboard/Helpers/TabHelpers.cs
index a9cc90c9..fff1b7cf 100644
--- a/Dashboard/Helpers/TabHelpers.cs
+++ b/Dashboard/Helpers/TabHelpers.cs
@@ -87,7 +87,7 @@ public static class TabHelpers
 
         /// <summary>
         /// Returns the set of wait types that should be selected by default:
-        /// poison waits + usual suspects + top 10 by total wait time (deduped), capped at 20.
+        /// poison waits + usual suspects + top 10 by total wait time (deduped), capped at 30.
         /// The availableWaitTypes list must be sorted by total wait time descending.
         /// </summary>
         public static HashSet<string> GetDefaultWaitTypes(IList<string> availableWaitTypes)
@@ -108,11 +108,11 @@ public static HashSet<string> GetDefaultWaitTypes(IList<string> availableWaitTyp
                     if (w.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
                         defaults.Add(w);
 
-            // 4. Top 10 by total wait time (items not already in the set), hard cap at 20 total
+            // 4. Top 10 by total wait time (items not already in the set), hard cap at 30 total
             int added = 0;
             foreach (var w in availableWaitTypes)
             {
-                if (defaults.Count >= 20) break;
+                if (defaults.Count >= 30) break;
                 if (added >= 10) break;
                 if (defaults.Add(w))
                 {
diff --git a/Lite/Controls/ServerTab.xaml b/Lite/Controls/ServerTab.xaml
index 342dd44b..41110533 100644
--- a/Lite/Controls/ServerTab.xaml
+++ b/Lite/Controls/ServerTab.xaml
@@ -127,7 +127,7 @@
                             <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,4">
                                 <Button Content="Top Waits" Click="WaitTypeSelectAll_Click" Padding="6,2" Margin="0,0,4,0" FontSize="11"/>
                                 <Button Content="Clear All" Click="WaitTypeClearAll_Click" Padding="6,2" FontSize="11"/>
-                                <TextBlock x:Name="WaitTypeCountText" Text="0 / 20 selected" FontSize="10" Foreground="{StaticResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                                <TextBlock x:Name="WaitTypeCountText" Text="0 / 30 selected" FontSize="10" Foreground="{StaticResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
                             </StackPanel>
                             <TextBox Grid.Row="2" x:Name="WaitTypeSearchBox" TextChanged="WaitTypeSearch_TextChanged"
                                      Margin="0,0,0,4" Padding="4,2"/>
diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index 28787580..a400e825 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -1119,7 +1119,7 @@ private static HashSet<string> GetDefaultWaitTypes(List<string> availableWaitTyp
         int added = 0;
         foreach (var w in availableWaitTypes)
         {
-            if (defaults.Count >= 20) break;
+            if (defaults.Count >= 30) break;
             if (added >= 10) break;
             if (defaults.Add(w)) { added++; }
         }
@@ -1156,8 +1156,8 @@ private void UpdateWaitTypeCount()
     {
         if (_waitTypeItems == null || WaitTypeCountText == null) return;
         int count = _waitTypeItems.Count(x => x.IsSelected);
-        WaitTypeCountText.Text = $"{count} / 20 selected";
-        WaitTypeCountText.Foreground = count >= 20
+        WaitTypeCountText.Text = $"{count} / 30 selected";
+        WaitTypeCountText.Foreground = count >= 30
             ? new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#E57373")!)
             : (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush");
     }
diff --git a/install/47_create_reporting_views.sql b/install/47_create_reporting_views.sql
index 6cef9387..016e64ad 100644
--- a/install/47_create_reporting_views.sql
+++ b/install/47_create_reporting_views.sql
@@ -144,7 +144,7 @@ WITH
     WHERE ws.collection_time >= DATEADD(HOUR, -1, SYSDATETIME())
     AND   ws.wait_time_ms_delta > 0
 )
-SELECT TOP (20)
+SELECT TOP (50)
     wait_type = rw.wait_type,
     wait_time_ms = rw.wait_time_ms_delta,
     wait_time_sec = rw.wait_time_ms_delta / 1000.0,