diff --git a/srv/poe_manager/app.py b/srv/poe_manager/app.py
index 1696a07..1a135b7 100644
--- a/srv/poe_manager/app.py
+++ b/srv/poe_manager/app.py
@@ -314,7 +314,7 @@ def devices():
                switches.hostname AS switch_hostname
         FROM devices
         LEFT JOIN switches ON devices.switch_hostname = switches.hostname
-        ORDER BY switches.hostname ASC
+        ORDER BY switches.hostname ASC, devices.name ASC
     """).fetchall()
 
     conn.close()
diff --git a/srv/poe_manager/sqlite.db b/srv/poe_manager/sqlite.db
index 2852c0d..5644d9b 100644
Binary files a/srv/poe_manager/sqlite.db and b/srv/poe_manager/sqlite.db differ