diff --git a/modules/wifi.go b/modules/wifi.go
index aab45e6f..a8211bae 100644
--- a/modules/wifi.go
+++ b/modules/wifi.go
@@ -284,7 +284,9 @@ func (w *WiFiModule) updateInfo(dot11 *layers.Dot11, packet gopacket.Packet) {
 
 	if ok, bssid, info := packets.Dot11ParseWPS(packet, dot11); ok {
 		if station, found := w.Session.WiFi.Get(bssid.String()); found {
-			station.WPS = info
+			for name, value := range info {
+				station.WPS[name] = value
+			}
 		}
 	}
 }
diff --git a/network/wifi_station.go b/network/wifi_station.go
index 2c40e588..ed70412a 100644
--- a/network/wifi_station.go
+++ b/network/wifi_station.go
@@ -34,6 +34,7 @@ func NewStation(essid, bssid string, frequency int, rssi int8) *Station {
 		Endpoint:  NewEndpointNoResolve(MonitorModeAddress, bssid, cleanESSID(essid), 0),
 		Frequency: frequency,
 		RSSI:      rssi,
+		WPS:       make(map[string]string),
 	}
 }