diff --git a/src/RolemasterDb.App/Components/Pages/Tables.razor b/src/RolemasterDb.App/Components/Pages/Tables.razor
index 146655e..9a1c5b9 100644
--- a/src/RolemasterDb.App/Components/Pages/Tables.razor
+++ b/src/RolemasterDb.App/Components/Pages/Tables.razor
@@ -350,9 +350,6 @@
     {
         referenceData = await LookupService.GetReferenceDataAsync();
         isReferenceDataLoading = false;
-
-        selectedTableSlug = referenceData?.CriticalTables.FirstOrDefault()?.Key ?? string.Empty;
-        await LoadTableDetailAsync();
     }
 
     private void ToggleTableMenu()
@@ -423,7 +420,8 @@
                 hasResolvedStoredTableSelection = true;
 
                 var resolvedTableSlug = ResolveSelectedTableSlug(storedTableSlug);
-                if (!string.Equals(resolvedTableSlug, selectedTableSlug, StringComparison.OrdinalIgnoreCase))
+                if (string.IsNullOrWhiteSpace(selectedTableSlug) ||
+                    !string.Equals(resolvedTableSlug, selectedTableSlug, StringComparison.OrdinalIgnoreCase))
                 {
                     selectedTableSlug = resolvedTableSlug;
                     await LoadTableDetailAsync();