diff --git a/frontend-modern/src/components/Alerts/ResourceTable.tsx b/frontend-modern/src/components/Alerts/ResourceTable.tsx
index a0ec4846b..ee91f1c05 100644
--- a/frontend-modern/src/components/Alerts/ResourceTable.tsx
+++ b/frontend-modern/src/components/Alerts/ResourceTable.tsx
@@ -311,6 +311,22 @@ export function ResourceTable(props: ResourceTableProps) {
                                   {resource.disabled ? 'Disabled' : 'Enabled'}
                                 </button>
                               </Show>
+                              <Show
+                                when={resource.type === 'guest' && props.onToggleNodeConnectivity}
+                              >
+                                <button
+                                  type="button"
+                                  onClick={() => props.onToggleNodeConnectivity?.(resource.id)}
+                                  class={`px-2 py-0.5 text-xs font-medium rounded transition-colors ${
+                                    resource.disableConnectivity
+                                      ? 'bg-red-100 dark:bg-red-900/50 text-red-700 dark:text-red-300 hover:bg-red-200 dark:hover:bg-red-800/50'
+                                      : 'bg-green-100 dark:bg-green-900/50 text-green-700 dark:text-green-300 hover:bg-green-200 dark:hover:bg-green-800/50'
+                                  }`}
+                                  title="Toggle powered-off alerts for this guest"
+                                >
+                                  {resource.disableConnectivity ? 'No Powered-Off' : 'Alert Powered-Off'}
+                                </button>
+                              </Show>
                               <Show
                                 when={resource.type === 'node' && props.onToggleNodeConnectivity}
                               >
@@ -680,6 +696,22 @@ export function ResourceTable(props: ResourceTableProps) {
                                 {resource.disabled ? 'Disabled' : 'Enabled'}
                               </button>
                             </Show>
+                            <Show
+                              when={resource.type === 'guest' && props.onToggleNodeConnectivity}
+                            >
+                              <button
+                                type="button"
+                                onClick={() => props.onToggleNodeConnectivity?.(resource.id)}
+                                class={`px-2 py-0.5 text-xs font-medium rounded transition-colors ${
+                                  resource.disableConnectivity
+                                    ? 'bg-red-100 dark:bg-red-900/50 text-red-700 dark:text-red-300 hover:bg-red-200 dark:hover:bg-red-800/50'
+                                    : 'bg-green-100 dark:bg-green-900/50 text-green-700 dark:text-green-300 hover:bg-green-200 dark:hover:bg-green-800/50'
+                                }`}
+                                title="Toggle powered-off alerts for this guest"
+                              >
+                                {resource.disableConnectivity ? 'No Powered-Off' : 'Alert Powered-Off'}
+                              </button>
+                            </Show>
                             <Show when={resource.type === 'node' && props.onToggleNodeConnectivity}>
                               <button
                                 type="button"
diff --git a/frontend-modern/src/components/Alerts/ThresholdsTable.tsx b/frontend-modern/src/components/Alerts/ThresholdsTable.tsx
index ecde9540c..49c8a0060 100644
--- a/frontend-modern/src/components/Alerts/ThresholdsTable.tsx
+++ b/frontend-modern/src/components/Alerts/ThresholdsTable.tsx
@@ -225,8 +225,9 @@ export function ThresholdsTable(props: ThresholdsTableProps) {
           );
         });
 
-      // A guest has an override if it has custom thresholds OR is disabled
-      const hasOverride = hasCustomThresholds || override?.disabled || false;
+      // A guest has an override if it has custom thresholds OR is disabled OR has connectivity disabled
+      const hasOverride =
+        hasCustomThresholds || override?.disabled || override?.disableConnectivity || false;
 
       return {
         id: guestId,
@@ -239,6 +240,7 @@ export function ThresholdsTable(props: ThresholdsTableProps) {
         status: guest.status,
         hasOverride: hasOverride,
         disabled: override?.disabled || false,
+        disableConnectivity: override?.disableConnectivity || false,
         thresholds: override?.thresholds || {},
         defaults: props.guestDefaults,
       };
@@ -573,11 +575,12 @@ export function ThresholdsTable(props: ThresholdsTableProps) {
   };
 
   const toggleNodeConnectivity = (resourceId: string, forceState?: boolean) => {
-    // Find the resource - could be a node or PBS server
+    // Find the resource - could be a node, PBS server, or guest
     const nodes = nodesWithOverrides();
     const pbsServers = pbsServersWithOverrides();
-    const resource = [...nodes, ...pbsServers].find((r) => r.id === resourceId);
-    if (!resource || (resource.type !== 'node' && resource.type !== 'pbs')) return;
+    const guests = guestsWithOverrides();
+    const resource = [...nodes, ...pbsServers, ...guests].find((r) => r.id === resourceId);
+    if (!resource || (resource.type !== 'node' && resource.type !== 'pbs' && resource.type !== 'guest')) return;
 
     // Get existing override if it exists
     const existingOverride = props.overrides().find((o) => o.id === resourceId);