diff --git a/hatasmota/const.py b/hatasmota/const.py
index ac7a4a4..e5b42d2 100644
--- a/hatasmota/const.py
+++ b/hatasmota/const.py
@@ -130,6 +130,7 @@
 SENSOR_STATUS_RESTART_REASON = "status_restart_reason"
 SENSOR_STATUS_RSSI = "status_rssi"
 SENSOR_STATUS_SIGNAL = "status_signal"
+SENSOR_STATUS_SSID = "status_ssid"
 
 SENSOR_UNIT_PRESSURE = "PressureUnit"
 SENSOR_UNIT_SPEED = "SpeedUnit"
diff --git a/hatasmota/status_sensor.py b/hatasmota/status_sensor.py
index 2a1f0d7..d39f2dc 100644
--- a/hatasmota/status_sensor.py
+++ b/hatasmota/status_sensor.py
@@ -17,6 +17,7 @@
     SENSOR_STATUS_RESTART_REASON,
     SENSOR_STATUS_RSSI,
     SENSOR_STATUS_SIGNAL,
+    SENSOR_STATUS_SSID,
     SIGNAL_STRENGTH_DECIBELS,
 )
 from .entity import (
@@ -55,25 +56,27 @@
 
 SENSORS = [
     SENSOR_STATUS_IP,
-    SENSOR_STATUS_SIGNAL,
+    SENSOR_STATUS_LAST_RESTART_TIME,
+    SENSOR_STATUS_LINK_COUNT,
+    SENSOR_STATUS_MQTT_COUNT,
     SENSOR_STATUS_RESTART_REASON,
     SENSOR_STATUS_RSSI,
-    SENSOR_STATUS_MQTT_COUNT,
-    SENSOR_STATUS_LINK_COUNT,
-    SENSOR_STATUS_LAST_RESTART_TIME,
+    SENSOR_STATUS_SIGNAL,
+    SENSOR_STATUS_SSID,
 ]
 
 NAMES = {
     SENSOR_STATUS_IP: "IP",
+    SENSOR_STATUS_LAST_RESTART_TIME: "Last Restart Time",
     SENSOR_STATUS_LINK_COUNT: "WiFi Connect Count",
     SENSOR_STATUS_MQTT_COUNT: "MQTT Connect Count",
     SENSOR_STATUS_RESTART_REASON: "Restart Reason",
     SENSOR_STATUS_RSSI: "RSSI",
     SENSOR_STATUS_SIGNAL: "Signal",
-    SENSOR_STATUS_LAST_RESTART_TIME: "Last Restart Time",
+    SENSOR_STATUS_SSID: "SSID",
 }
 
-SINGLE_SHOT = [SENSOR_STATUS_RESTART_REASON, SENSOR_STATUS_LAST_RESTART_TIME]
+SINGLE_SHOT = [SENSOR_STATUS_LAST_RESTART_TIME, SENSOR_STATUS_RESTART_REASON]
 
 STATE_PATHS = {
     SENSOR_STATUS_LINK_COUNT: ["Wifi", "LinkCount"],
@@ -83,41 +86,45 @@
 }
 
 STATUS_PATHS = {
+    SENSOR_STATUS_LAST_RESTART_TIME: ["StatusSTS", "UptimeSec"],
     SENSOR_STATUS_LINK_COUNT: ["StatusSTS", "Wifi", "LinkCount"],
     SENSOR_STATUS_MQTT_COUNT: ["StatusSTS", "MqttCount"],
     SENSOR_STATUS_RESTART_REASON: ["StatusPRM", "RestartReason"],
     SENSOR_STATUS_RSSI: ["StatusSTS", "Wifi", "RSSI"],
     SENSOR_STATUS_SIGNAL: ["StatusSTS", "Wifi", "Signal"],
-    SENSOR_STATUS_LAST_RESTART_TIME: ["StatusSTS", "UptimeSec"],
+    SENSOR_STATUS_SSID: ["StatusSTS", "Wifi", "SSId"],
 }
 
 STATUS_TOPICS = {
+    SENSOR_STATUS_LAST_RESTART_TIME: 11,
     SENSOR_STATUS_LINK_COUNT: 11,
     SENSOR_STATUS_MQTT_COUNT: 11,
     SENSOR_STATUS_RESTART_REASON: 1,
     SENSOR_STATUS_RSSI: 11,
     SENSOR_STATUS_SIGNAL: 11,
-    SENSOR_STATUS_LAST_RESTART_TIME: 11,
+    SENSOR_STATUS_SSID: 11,
 }
 
 QUANTITY = {
     SENSOR_STATUS_IP: SENSOR_STATUS_IP,
+    SENSOR_STATUS_LAST_RESTART_TIME: SENSOR_STATUS_LAST_RESTART_TIME,
     SENSOR_STATUS_LINK_COUNT: SENSOR_STATUS_LINK_COUNT,
     SENSOR_STATUS_MQTT_COUNT: SENSOR_STATUS_MQTT_COUNT,
     SENSOR_STATUS_RESTART_REASON: SENSOR_STATUS_RESTART_REASON,
     SENSOR_STATUS_RSSI: SENSOR_STATUS_RSSI,
     SENSOR_STATUS_SIGNAL: SENSOR_STATUS_SIGNAL,
-    SENSOR_STATUS_LAST_RESTART_TIME: SENSOR_STATUS_LAST_RESTART_TIME,
+    SENSOR_STATUS_SSID: SENSOR_STATUS_SSID,
 }
 
 UNITS = {
     SENSOR_STATUS_IP: None,
+    SENSOR_STATUS_LAST_RESTART_TIME: None,
     SENSOR_STATUS_LINK_COUNT: None,
     SENSOR_STATUS_MQTT_COUNT: None,
     SENSOR_STATUS_RESTART_REASON: None,
     SENSOR_STATUS_RSSI: PERCENTAGE,
     SENSOR_STATUS_SIGNAL: SIGNAL_STRENGTH_DECIBELS,
-    SENSOR_STATUS_LAST_RESTART_TIME: None,
+    SENSOR_STATUS_SSID: None,
 }