From ba498d307c146c08660e90cacfad69eeffe154db Mon Sep 17 00:00:00 2001
From: PeterYurkovich <pyurkovi@redhat.com>
Date: Tue, 12 May 2026 10:04:24 -0400
Subject: [PATCH] fix: prevent namespace desync through namespace variable
 loading race condition

---
 .../components/dashboards/legacy/legacy-variable-dropdowns.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx b/web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx
index 32367bfae..2e6e9b67d 100644
--- a/web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx
+++ b/web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx
@@ -266,7 +266,8 @@ const LegacyDashboardsVariableDropdown: FC<VariableDropdownProps> = ({
   ]);
 
   useEffect(() => {
-    if (variable?.value !== queryParam) {
+    // Wait to set variable and query values until all options have been loaded
+    if (variable?.value !== queryParam && options?.length > 0) {
       // Default to using the query param to allow for sharable links
       if (queryParam && options?.includes(queryParam)) {
         dispatch(dashboardsPatchVariable(dashboardName, name, { value: queryParam }));