diff --git a/vehicle/OVMS.V3/main/ovms_netmanager.cpp b/vehicle/OVMS.V3/main/ovms_netmanager.cpp
index ec4933a4..c5228233 100644
--- a/vehicle/OVMS.V3/main/ovms_netmanager.cpp
+++ b/vehicle/OVMS.V3/main/ovms_netmanager.cpp
@@ -350,7 +350,7 @@ void OvmsNetManager::WifiStaGotIP(std::string event, void* data)
     ScheduleCleanup();
   #endif
 
-  WifiStaCheckSQ(NULL);
+  WifiStaCheckSQ(StdMetrics.ms_m_net_wifi_sq);
   }
 
 void OvmsNetManager::WifiStaLostIP(std::string event, void* data)
@@ -377,6 +377,7 @@ void OvmsNetManager::WifiStaConnected(std::string event, void* data)
 
 void OvmsNetManager::WifiStaStop(std::string event, void* data)
   {
+  WifiStaSetSQ(false);
   if (m_wifi_sta)
     {
     m_wifi_sta = false;
@@ -435,6 +436,15 @@ void OvmsNetManager::WifiStaCheckSQ(OvmsMetric* metric)
     }
   }
 
+void OvmsNetManager::WifiStaSetSQ(bool good)
+  {
+  if (m_wifi_sta && m_wifi_good != good)
+    {
+    m_wifi_good = good;
+    MyEvents.SignalEvent(good ? "network.wifi.sta.good" : "network.wifi.sta.bad", NULL);
+    }
+  }
+
 void OvmsNetManager::WifiUpAP(std::string event, void* data)
   {
   m_wifi_ap = true;