diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml.cs b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
index 276f8390..3665466f 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml.cs
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
@@ -1754,6 +1754,19 @@ private async Task RefreshWaitStatsDetailTabAsync()
                     })
                     .ToList();
 
+                // Ensure poison waits are always in the picker even if they have no collected data
+                foreach (var poisonWait in TabHelpers.PoisonWaits)
+                {
+                    if (!waitTypes.Any(w => string.Equals(w.WaitType, poisonWait, StringComparison.OrdinalIgnoreCase)))
+                    {
+                        waitTypes.Add(new WaitTypeSelectionItem
+                        {
+                            WaitType = poisonWait,
+                            IsSelected = previouslySelected.Contains(poisonWait)
+                        });
+                    }
+                }
+
                 // If nothing was previously selected, apply poison waits + usual suspects + top 10
                 if (!waitTypes.Any(w => w.IsSelected))
                 {