diff --git a/server/src/resolvers/WifiDevice.js b/server/src/resolvers/WifiDevice.js
index 240771c..8198aad 100644
--- a/server/src/resolvers/WifiDevice.js
+++ b/server/src/resolvers/WifiDevice.js
@@ -13,7 +13,22 @@ const WifiDevice = {
       })
     ).user,
 
-  accessPoint: async parent => prisma.accessPoint.findUnique({ where: { id: parent.accessPointId } })
+  accessPoint: async parent => {
+
+    if (!parent.accessPointId && parent.apName) {
+      await prisma.wifiDevice.update({
+        where: { id: parent.id }, data: {
+          accessPoint: {
+            connect: {
+              hostname: parent.apName
+            }
+          }
+        }
+      })
+    }
+
+    return prisma.accessPoint.findUnique({ where: { id: parent.accessPointId } })
+  }
 }
 
 export { WifiDevice }
diff --git a/web/src/views/WifiUsers.vue b/web/src/views/WifiUsers.vue
index d2e61a1..941bddb 100644
--- a/web/src/views/WifiUsers.vue
+++ b/web/src/views/WifiUsers.vue
@@ -129,7 +129,19 @@
                           </v-list-item-subtitle>
                         </v-list-item-content>
                       </v-list-item>
-
+                      <v-list-item v-if="device.accessPoint.local">
+                        <v-list-item-action>
+                          <v-icon>mdi-map-marker-radius</v-icon>
+                        </v-list-item-action>
+                        <v-list-item-content>
+                          <v-list-item-title>
+                            {{ device.accessPoint.local }}
+                          </v-list-item-title>
+                          <v-list-item-subtitle>
+                            Localização do AP
+                          </v-list-item-subtitle>
+                        </v-list-item-content>
+                      </v-list-item>
                       <v-list-item>
                         <v-list-item-action>
                           <v-icon>mdi-ip-network</v-icon>
@@ -245,6 +257,11 @@ export default {
               apName
               essid
               ip
+              accessPoint {
+                name
+                hostname
+                local
+              }
             }
           }
         }