diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Components/Pages/Clusters/ClusterDetail.razor b/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Components/Pages/Clusters/ClusterDetail.razor
index 87f6e26..4bd5120 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Components/Pages/Clusters/ClusterDetail.razor
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.Admin/Components/Pages/Clusters/ClusterDetail.razor
@@ -101,29 +101,44 @@ else
     {
         <Generations ClusterId="@ClusterId"/>
     }
-    else if (_tab == "equipment" && _currentDraft is not null)
+    else if (_tab is "equipment" or "uns" or "namespaces" or "drivers" or "tags" or "acls")
     {
-        <EquipmentTab GenerationId="@_currentDraft.GenerationId"/>
-    }
-    else if (_tab == "uns" && _currentDraft is not null)
-    {
-        <UnsTab GenerationId="@_currentDraft.GenerationId" ClusterId="@ClusterId"/>
-    }
-    else if (_tab == "namespaces" && _currentDraft is not null)
-    {
-        <NamespacesTab GenerationId="@_currentDraft.GenerationId" ClusterId="@ClusterId"/>
-    }
-    else if (_tab == "drivers" && _currentDraft is not null)
-    {
-        <DriversTab GenerationId="@_currentDraft.GenerationId" ClusterId="@ClusterId"/>
-    }
-    else if (_tab == "tags" && _currentDraft is not null)
-    {
-        <TagsTab GenerationId="@_currentDraft.GenerationId" ClusterId="@ClusterId"/>
-    }
-    else if (_tab == "acls" && _currentDraft is not null)
-    {
-        <AclsTab GenerationId="@_currentDraft.GenerationId" ClusterId="@ClusterId"/>
+        @* Bug #10 fix — these six tabs are scoped to a generation. Per docs/v2/admin-ui.md the
+           design intent is a read-only view of the published generation when no draft is open
+           ("Edit in draft" affordance), and the editable view of the draft when one is open.
+           The earlier implementation rendered nothing in the no-draft case, leaving operators
+           with just the "Open a draft to edit" placeholder. We now route both states through
+           the same tab components, gating edits via <fieldset disabled> so a button click in
+           the read-only state cannot silently mutate the published rows even though the tab
+           components themselves haven't been refactored to honor an IsReadOnly flag yet. *@
+        var genId = _currentDraft?.GenerationId ?? _currentPublished?.GenerationId;
+        var isReadOnly = _currentDraft is null;
+        if (genId is null)
+        {
+            <section class="panel notice rise" style="animation-delay:.02s">
+                No published generation yet. Click <strong>New draft</strong> above to author this cluster's first generation.
+            </section>
+        }
+        else
+        {
+            if (isReadOnly)
+            {
+                <section class="panel notice rise mb-3" style="animation-delay:.02s">
+                    <strong>Read-only view</strong> of published generation @genId. Click <strong>New draft</strong> above to make changes.
+                </section>
+            }
+            <fieldset disabled="@isReadOnly" style="border:0;padding:0;margin:0;min-width:0;">
+                @switch (_tab)
+                {
+                    case "equipment":  <EquipmentTab GenerationId="@genId.Value"/> break;
+                    case "uns":        <UnsTab GenerationId="@genId.Value" ClusterId="@ClusterId"/> break;
+                    case "namespaces": <NamespacesTab GenerationId="@genId.Value" ClusterId="@ClusterId"/> break;
+                    case "drivers":    <DriversTab GenerationId="@genId.Value" ClusterId="@ClusterId"/> break;
+                    case "tags":       <TagsTab GenerationId="@genId.Value" ClusterId="@ClusterId"/> break;
+                    case "acls":       <AclsTab GenerationId="@genId.Value" ClusterId="@ClusterId"/> break;
+                }
+            </fieldset>
+        }
     }
     else if (_tab == "redundancy")
     {
@@ -133,10 +148,6 @@ else
     {
         <AuditTab ClusterId="@ClusterId"/>
     }
-    else
-    {
-        <section class="panel notice rise" style="animation-delay:.02s">Open a draft to edit this cluster's content.</section>
-    }
 }
 
 @code {