diff --git a/src/FrontOffice.Main/Pages/Commission/WeeklyBalancePage.razor.cs b/src/FrontOffice.Main/Pages/Commission/WeeklyBalancePage.razor.cs
index 1f6aadb..c714d83 100644
--- a/src/FrontOffice.Main/Pages/Commission/WeeklyBalancePage.razor.cs
+++ b/src/FrontOffice.Main/Pages/Commission/WeeklyBalancePage.razor.cs
@@ -39,7 +39,7 @@ public partial class WeeklyBalancePage : ComponentBase
             {
                 await _weekSelector.EnsureLoadedAsync();
                 
-                // Handle query parameter ?week=2 (WeekDefinitionId)
+                // Handle query parameter ?week=7 (WeekDefinitionId)
                 if (!string.IsNullOrEmpty(QueryWeekNumber))
                 {
                     // Try to parse as WeekDefinitionId first (most common from dashboard links)
@@ -52,6 +52,13 @@ public partial class WeeklyBalancePage : ComponentBase
                         {
                             _selectedWeekDefinition = _weekSelector.FindByWeekOrder(weekOrder);
                         }
+                        
+                        // If still not found in cache, create a temporary definition with just the Id
+                        // so we can still query the balance from BFF
+                        if (_selectedWeekDefinition == null)
+                        {
+                            _selectedWeekDefinition = new WeekDefinitionDto { Id = id, DisplayName = $"هفته {id}" };
+                        }
                     }
                 }