diff --git a/README.md b/README.md
index cc243e9..ed404b5 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 A self-hosted, full-stack network management platform for MikroTik devices. Monitor, configure, and manage your entire MikroTik infrastructure — routers, switches, and wireless access points — from a single web interface.
 
-![Version](https://img.shields.io/badge/version-0.11.8_Beta-blue)
+![Version](https://img.shields.io/badge/version-0.11.9_Beta-blue)
 ![License](https://img.shields.io/badge/license-AGPLv3-blue)
 ![Docker](https://img.shields.io/badge/docker-compose-2496ED?logo=docker&logoColor=white)
 ![TypeScript](https://img.shields.io/badge/TypeScript-5.3-3178C6?logo=typescript&logoColor=white)
diff --git a/backend/package.json b/backend/package.json
index 20d8c99..47e6505 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mikrotik-manager-backend",
-  "version": "0.11.8-beta",
+  "version": "0.11.9-beta",
   "description": "Mikrotik Network Management Platform - Backend API",
   "main": "dist/index.js",
   "scripts": {
diff --git a/backend/src/routes/switches.ts b/backend/src/routes/switches.ts
index d69f001..19f7929 100644
--- a/backend/src/routes/switches.ts
+++ b/backend/src/routes/switches.ts
@@ -101,10 +101,12 @@ router.put('/lldp', requireWrite, async (req: Request, res: Response) => {
   });
 });
 
-// GET /api/switches/snmp — SNMP config/status per online switch
+// GET /api/switches/snmp — SNMP config/status for all managed switches
+// Includes offline/unknown devices so the list never disappears during a poll cycle.
+// Unreachable devices fall through to the Promise.allSettled error path and render with an error note.
 router.get('/snmp', async (_req: Request, res: Response) => {
   const switches = await query<DeviceRow>(
-    `SELECT * FROM devices WHERE device_type = 'switch' AND status = 'online'`
+    `SELECT * FROM devices WHERE device_type = 'switch' ORDER BY name`
   );
 
   const results = await Promise.allSettled(
diff --git a/frontend/package.json b/frontend/package.json
index 0236e95..aceea21 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mikrotik-manager-frontend",
-  "version": "0.11.8-beta",
+  "version": "0.11.9-beta",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/frontend/src/pages/SwitchesSettingsPage.tsx b/frontend/src/pages/SwitchesSettingsPage.tsx
index f490d0f..fcbab08 100644
--- a/frontend/src/pages/SwitchesSettingsPage.tsx
+++ b/frontend/src/pages/SwitchesSettingsPage.tsx
@@ -93,6 +93,7 @@ export default function SwitchesSettingsPage() {
   const { data: snmpStatuses = [], isLoading: snmpLoading, refetch: refetchSnmp, isFetching: snmpFetching } =
     useQuery({
       queryKey: ['switches-snmp'],
+      staleTime: 60_000,
       queryFn: () => switchesApi.getSnmpStatus().then(r => {
         // Pre-populate form from first successful result (if form not yet manually edited)
         const first = r.data.find(s => s.enabled != null && !s.error);
@@ -436,7 +437,9 @@ export default function SwitchesSettingsPage() {
           <div className="flex items-center gap-2 text-sm text-gray-400">
             <RefreshCw className="w-4 h-4 animate-spin" /> Checking SNMP status on all switches…
           </div>
-        ) : snmpStatuses.length > 0 && (
+        ) : snmpStatuses.length === 0 ? (
+          <p className="text-sm text-gray-400 dark:text-slate-500 py-1">No managed switches found.</p>
+        ) : (
           <div className="rounded-lg border border-gray-200 dark:border-slate-700 overflow-hidden">
             <table className="w-full text-sm">
               <thead>
diff --git a/frontend/src/version.ts b/frontend/src/version.ts
index 796a515..8f0dc7f 100644
--- a/frontend/src/version.ts
+++ b/frontend/src/version.ts
@@ -1 +1 @@
-export const APP_VERSION = 'v0.11.8 Beta';
+export const APP_VERSION = 'v0.11.9 Beta';