diff --git a/frontend-modern/src/components/Alerts/ThresholdsTable.tsx b/frontend-modern/src/components/Alerts/ThresholdsTable.tsx
index 613c0d0f7..00e437460 100644
--- a/frontend-modern/src/components/Alerts/ThresholdsTable.tsx
+++ b/frontend-modern/src/components/Alerts/ThresholdsTable.tsx
@@ -910,6 +910,25 @@ export function ThresholdsTable(props: ThresholdsTableProps) {
         />
       </Show>
       
+      {/* PBS Servers Table */}
+      <Show when={pbsServersWithOverrides().length > 0}>
+        <ResourceTable
+          title="PBS Servers"
+          resources={pbsServersWithOverrides()}
+          columns={['CPU %', 'Memory %']}
+          activeAlerts={props.activeAlerts}
+          onEdit={startEditing}
+          onSaveEdit={saveEdit}
+          onCancelEdit={cancelEdit}
+          onRemoveOverride={removeOverride}
+          editingId={editingId}
+          editingThresholds={editingThresholds}
+          setEditingThresholds={setEditingThresholds}
+          formatMetricValue={formatMetricValue}
+          hasActiveAlert={hasActiveAlert}
+        />
+      </Show>
+      
       {/* Guests Table */}
       <Show when={Object.keys(guestsGroupedByNode()).length > 0}>
         <ResourceTable
@@ -949,25 +968,6 @@ export function ThresholdsTable(props: ThresholdsTableProps) {
           hasActiveAlert={hasActiveAlert}
         />
       </Show>
-      
-      {/* PBS Servers Table */}
-      <Show when={pbsServersWithOverrides().length > 0}>
-        <ResourceTable
-          title="PBS Servers"
-          resources={pbsServersWithOverrides()}
-          columns={['CPU %', 'Memory %']}
-          activeAlerts={props.activeAlerts}
-          onEdit={startEditing}
-          onSaveEdit={saveEdit}
-          onCancelEdit={cancelEdit}
-          onRemoveOverride={removeOverride}
-          editingId={editingId}
-          editingThresholds={editingThresholds}
-          setEditingThresholds={setEditingThresholds}
-          formatMetricValue={formatMetricValue}
-          hasActiveAlert={hasActiveAlert}
-        />
-      </Show>
     </div>
   );
 }
\ No newline at end of file