diff --git a/server/src/resolvers/WifiDevice.js b/server/src/resolvers/WifiDevice.js
index 2a5ea5a..f670d92 100644
--- a/server/src/resolvers/WifiDevice.js
+++ b/server/src/resolvers/WifiDevice.js
@@ -1,6 +1,6 @@
 const WifiDevice = {
-  lastSeen: _ => _.lastSeen.toISOString(),
-  firstSeen: _ => _.firstSeen.toISOString()
+  lastSeen: _ => _.lastSeen?.toISOString(),
+  firstSeen: _ => _.firstSeen?.toISOString()
 }
 
 export { WifiDevice }
diff --git a/web/src/mixins/Nav.js b/web/src/mixins/Nav.js
index 0015a5f..c3c3dae 100644
--- a/web/src/mixins/Nav.js
+++ b/web/src/mixins/Nav.js
@@ -40,6 +40,12 @@ export default {
             route: { name: 'user-presence' },
             role: 'watcher'
           },
+          {
+            title: 'Dispositivos WiFi',
+            icon: 'mdi-cellphone-wireless',
+            route: { name: 'wifi-devices' },
+            role: 'superAdmin'
+          },
           {
             title: 'Criar token',
             icon: 'mdi-qrcode',
diff --git a/web/src/router/index.js b/web/src/router/index.js
index 6efca2f..155ece5 100755
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -154,6 +154,18 @@ const routes = [
         /* webpackChunkName: "user-presence" */ '../views/UserPresence.vue'
       )
   },
+
+  {
+    path: '/wifi-devices',
+    name: 'wifi-devices',
+    meta: {
+      title: 'Dispositivos WiFi',
+      watcher: true
+    },
+    component: () =>
+      import(/* webpackChunkName: "wifi-devices" */ '../views/WifiDevices.vue')
+  },
+
   {
     path: '/system-administration',
     name: 'system-administration',
diff --git a/web/src/views/WifiDevices.vue b/web/src/views/WifiDevices.vue
new file mode 100644
index 0000000..cf4e71d
--- /dev/null
+++ b/web/src/views/WifiDevices.vue
@@ -0,0 +1,60 @@
+<template>
+  <v-container fluid>
+    <v-data-table :headers="headers" :items="items"> </v-data-table>
+  </v-container>
+</template>
+
+<script>
+import gql from 'graphql-tag'
+
+export default {
+  name: 'WifiDevices',
+  data: () => ({
+    headers: [
+      { text: 'Hostname', value: 'hostname' },
+      { text: 'Usuário', value: 'user' },
+      { text: 'OUI', value: 'oui' },
+      { text: 'AP', value: 'apName' },
+      { text: 'Controladora', value: 'controller' },
+      { text: 'Endereço MAC', value: 'mac' }
+    ]
+  }),
+  apollo: {
+    wifiDevices: {
+      fetchPolicy: 'cache-and-network',
+      query: gql`
+        query {
+          wifiDevices {
+            user {
+              displayName
+              sAMAccountName
+            }
+            oui
+            mac
+            controller
+            hostname
+            firstSeen
+            lastSeen
+            essid
+            ip
+            uptime
+            apName
+            status
+          }
+        }
+      `
+    }
+  },
+  computed: {
+    items() {
+      return this.wifiDevices?.map(device => ({
+        ...device,
+        hostname: device.hostname || 'Desconhecido',
+        user: device.user.displayName
+      }))
+    }
+  }
+}
+</script>
+
+<style scoped></style>