diff --git a/server/db/db_upgrade.py b/server/db/db_upgrade.py
index d8299d67..55cda251 100755
--- a/server/db/db_upgrade.py
+++ b/server/db/db_upgrade.py
@@ -254,7 +254,7 @@ def ensure_views(sql) -> bool:
                     WITH base AS (
                         SELECT
                         rowid,
-                        IFNULL(devMac, '') AS devMac,
+                        LOWER(IFNULL(devMac, '')) AS devMac,
                         IFNULL(devName, '') AS devName,
                         IFNULL(devOwner, '') AS devOwner,
                         IFNULL(devType, '') AS devType,
@@ -281,7 +281,7 @@ def ensure_views(sql) -> bool:
                         IFNULL(devIsNew, '') AS devIsNew,
                         IFNULL(devLocation, '') AS devLocation,
                         IFNULL(devIsArchived, '') AS devIsArchived,
-                        IFNULL(devParentMAC, '') AS devParentMAC,
+                        LOWER(IFNULL(devParentMAC, '')) AS devParentMAC,
                         IFNULL(devParentPort, '') AS devParentPort,
                         IFNULL(devIcon, '') AS devIcon,
                         IFNULL(devGUID, '') AS devGUID,
@@ -316,7 +316,7 @@ def ensure_views(sql) -> bool:
                             WHEN EXISTS (
                                 SELECT 1
                                 FROM Events e
-                                WHERE e.eve_MAC = Devices.devMac
+                                WHERE LOWER(e.eve_MAC) = LOWER(Devices.devMac)
                                 AND e.eve_EventType IN ('Connected','Disconnected','Device Down','Down Reconnected')
                                 AND e.eve_DateTime >= datetime('now', '-{FLAP_WINDOW_HOURS} hours')
                                 GROUP BY e.eve_MAC
diff --git a/test/test_device_atomicity.py b/test/test_device_atomicity.py
index f6b257ad..83516fe6 100644
--- a/test/test_device_atomicity.py
+++ b/test/test_device_atomicity.py
@@ -58,6 +58,7 @@ class TestDeviceAtomicity(unittest.TestCase):
                 devScan INTEGER DEFAULT 0,
                 devAlertEvents INTEGER DEFAULT 0,
                 devAlertDown INTEGER DEFAULT 0,
+                devCanSleep INTEGER DEFAULT 0,
                 devParentRelType TEXT DEFAULT 'default',
                 devReqNicsOnline INTEGER DEFAULT 0,
                 devSkipRepeated INTEGER DEFAULT 0,