diff --git a/server/src/lib/wifiDevices.js b/server/src/lib/wifiDevices.js
index 589c0ab..8580634 100644
--- a/server/src/lib/wifiDevices.js
+++ b/server/src/lib/wifiDevices.js
@@ -1,6 +1,6 @@
 import { subMinutes } from 'date-fns'
-import { getOnlineWifiDevices as getOnlineUnifiDevices } from './unifiController'
-import { getOnlineWifiDevices as getOnlineCiscoDevices } from './ciscoController'
+import * as unifiController from './unifiController'
+import * as ciscoController from './ciscoController'
 
 import prisma from '../prisma'
 
@@ -15,16 +15,13 @@ const TIMEOUT_IN_MILLISECONDS = process.env.TASK_TIMEOUT || 120000
 
 let working = false
 
+const wifiControllers = [unifiController, ciscoController]
+
 async function getOnlineDevices() {
-  const onlineUnifiDevicesPromise = getOnlineUnifiDevices()
-  const onlineCiscoDevicesPromise = getOnlineCiscoDevices()
 
-  const [onlineUnifiDevices, onlineCiscoDevices] = await Promise.all([
-    onlineUnifiDevicesPromise,
-    onlineCiscoDevicesPromise
-  ])
+  const onlineDevicesPromises = wifiControllers.map(wifiController => wifiController.getOnlineWifiDevices())
 
-  const onlineDevices = [...onlineUnifiDevices, ...onlineCiscoDevices]
+  const onlineDevices = (await Promise.all(onlineDevicesPromises)).flat()
 
   return onlineDevices
 }