diff --git a/modules/wifi/wifi.go b/modules/wifi/wifi.go
index 92ce61e3..ce6c857a 100644
--- a/modules/wifi/wifi.go
+++ b/modules/wifi/wifi.go
@@ -87,6 +87,13 @@ func NewWiFiModule(s *session.Session) *WiFiModule {
 			return mod.Stop()
 		}))
 
+	mod.AddHandler(session.NewModuleHandler("wifi.clear", "",
+		"Clear all access points collected by the WiFi discovery module.",
+		func(args []string) error {
+			mod.Session.WiFi.Clear()
+			return nil
+		}))
+
 	mod.AddHandler(session.NewModuleHandler("wifi.recon MAC", "wifi.recon ((?:[0-9A-Fa-f]{2}[:-]){5}(?:[0-9A-Fa-f]{2}))",
 		"Set 802.11 base station address to filter for.",
 		func(args []string) error {
diff --git a/network/wifi.go b/network/wifi.go
index 1e916f20..9d991652 100644
--- a/network/wifi.go
+++ b/network/wifi.go
@@ -179,9 +179,10 @@ func (w *WiFi) GetClient(mac string) (*Station, bool) {
 	return nil, false
 }
 
-func (w *WiFi) Clear() error {
+func (w *WiFi) Clear() {
+	w.Lock()
+	defer w.Unlock()
 	w.aps = make(map[string]*AccessPoint)
-	return nil
 }
 
 func (w *WiFi) NumHandshakes() int {