diff --git a/src/components/LDeviceLocationPopup.vue b/src/components/LDeviceLocationPopup.vue
index 399fed0..85df3ff 100644
--- a/src/components/LDeviceLocationPopup.vue
+++ b/src/components/LDeviceLocationPopup.vue
@@ -33,6 +33,11 @@
           <ZapIcon size="1x" aria-hidden="true" role="img" />
           {{ speed }} km/h
         </li>
+        <li v-if="wifi.ssid" :title="$t('WiFi')">
+          <WifiIcon size="1x" aria-hidden="true" role="img" />
+          {{ wifi.ssid }}
+          <span v-if="wifi.bssid">({{ wifi.bssid }})</span>
+        </li>
       </ul>
     </div>
     <div v-if="regions.length" class="regions">
@@ -73,6 +78,7 @@ import {
   ClockIcon,
   HomeIcon,
   MapPinIcon,
+  WifiIcon,
   ZapIcon,
 } from "vue-feather-icons";
 import { LPopup } from "vue2-leaflet";
@@ -84,6 +90,7 @@ export default {
     ClockIcon,
     HomeIcon,
     MapPinIcon,
+    WifiIcon,
     ZapIcon,
     LPopup,
   },
@@ -136,6 +143,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    wifi: {
+      type: Object,
+      default: () => {},
+    },
     options: {
       type: Object,
       default: () => {},
diff --git a/src/locales/de-DE.json b/src/locales/de-DE.json
index 4e63dc5..3cdc5ec 100644
--- a/src/locales/de-DE.json
+++ b/src/locales/de-DE.json
@@ -33,5 +33,6 @@
   "Address": "Adresse",
   "Battery": "Akku",
   "Speed": "Geschwindigkeit",
-  "Regions:": "Regionen:"
+  "Regions:": "Regionen:",
+  "WiFi": "WLAN"
 }
diff --git a/src/locales/en-GB.json b/src/locales/en-GB.json
index 586481b..4b300e8 100644
--- a/src/locales/en-GB.json
+++ b/src/locales/en-GB.json
@@ -33,5 +33,6 @@
   "Address": "Address",
   "Battery": "Battery",
   "Speed": "Speed",
-  "Regions:": "Regions:"
+  "Regions:": "Regions:",
+  "WiFi": "WiFi"
 }
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 275c542..fc6016c 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -33,5 +33,6 @@
   "Address": "Address",
   "Battery": "Battery",
   "Speed": "Speed",
-  "Regions:": "Regions:"
+  "Regions:": "Regions:",
+  "WiFi": "WiFi"
 }
diff --git a/src/locales/es-ES.json b/src/locales/es-ES.json
index 40f97ef..954c0d7 100644
--- a/src/locales/es-ES.json
+++ b/src/locales/es-ES.json
@@ -33,5 +33,6 @@
   "Address": "Dirección",
   "Battery": "Bateria",
   "Speed": "Velocidad",
-  "Regions:": "Regiones:"
+  "Regions:": "Regiones:",
+  "WiFi": "WiFi"
 }
diff --git a/src/locales/fr-FR.json b/src/locales/fr-FR.json
index 0dc047d..9dd6074 100644
--- a/src/locales/fr-FR.json
+++ b/src/locales/fr-FR.json
@@ -33,5 +33,6 @@
   "Address": "Addresse",
   "Battery": "Batterie",
   "Speed": "Vitesse",
-  "Regions:": "Régions:"
+  "Regions:": "Régions:",
+  "WiFi": "WiFi"
 }
diff --git a/src/views/Map.vue b/src/views/Map.vue
index 44f5565..5e694e0 100644
--- a/src/views/Map.vue
+++ b/src/views/Map.vue
@@ -51,6 +51,7 @@
           :battery="l.batt"
           :speed="l.vel"
           :regions="l.inregions"
+          :wifi="{ ssid: l.SSID, bssid: l.BSSID }"
           :options="{ className: 'leaflet-popup--for-pin' }"
         />
       </LMarker>
@@ -90,6 +91,7 @@
               :battery="l.batt"
               :speed="l.vel"
               :regions="l.inregions"
+              :wifi="{ ssid: l.SSID, bssid: l.BSSID }"
             ></LDeviceLocationPopup>
           </LCircleMarker>
         </template>