diff --git a/README.md b/README.md
index daab6d6..82b2a12 100644
--- a/README.md
+++ b/README.md
@@ -21,12 +21,13 @@ sleep as android status is my solution for wake/sleep state within HA. it listen
 <ul>
   <li>
     <details>
-      <summary><strong>📡 8 sensors</strong></summary>
+      <summary><strong>📡 9 sensors</strong></summary>
       <ul>
         <li>message received *state*</li>
         <li>wake status</li>
         <li>sound</li>
         <li>disturbance</li>
+        <li>next alarm</li>
         <li>alarm</li>
         <li>lullaby</li>
         <li>sleep tracking</li>
diff --git a/custom_components/saas/sensor.py b/custom_components/saas/sensor.py
index 00cc7e4..91abd74 100644
--- a/custom_components/saas/sensor.py
+++ b/custom_components/saas/sensor.py
@@ -88,7 +88,7 @@ class SAASSensor(RestoreEntity):
         self._hass.states.async_set(self.entity_id, self._state)
         _LOGGER.info(f"{datetime.now().strftime('%H:%M:%S:%f')} (Line {inspect.currentframe().f_lineno}): Saved state: {self._state} for sensor {self.name}")
 
-class SAASAlarmEventSensor(RestoreEntity):
+class SAASAlarmEventSensor(RestoreEntity):
     """Representation of a SAAS - Sleep As Android Stats sensor for Alarm Events."""
 
     def __init__(self, hass, name, mapping, entry_id):
@@ -215,9 +215,67 @@ class SAASAlarmEventSensor(RestoreEntity):
         """Set the state to 'None' after a timeout."""
         await asyncio.sleep(15)
         self._state = "None"
-        self._last_event = "None"
-        _LOGGER.debug(f"{datetime.now().strftime('%H:%M:%S:%f')} (Line {inspect.currentframe().f_lineno}): Set state to 'None' due to timeout for sensor {self.name}")
-        self.async_schedule_update_ha_state()
+        self._last_event = "None"
+        _LOGGER.debug(f"{datetime.now().strftime('%H:%M:%S:%f')} (Line {inspect.currentframe().f_lineno}): Set state to 'None' due to timeout for sensor {self.name}")
+        self.async_schedule_update_ha_state()
+
+class SAASNextAlarmSensor(RestoreEntity):
+    """Sensor that exposes the next scheduled alarm time and label."""
+
+    def __init__(self, hass, name, entry_id):
+        self._hass = hass
+        self._name = name
+        self.entry_id = entry_id
+        self._state = None
+        self._label = None
+
+    @property
+    def unique_id(self):
+        return f"saas_next_alarm_{self._name}"
+
+    @property
+    def name(self):
+        return f"SAAS {self._name} Next Alarm"
+
+    @property
+    def state(self):
+        return self._state
+
+    @property
+    def extra_state_attributes(self):
+        return {"Label": self._label} if self._label else {}
+
+    async def async_added_to_hass(self):
+        await super().async_added_to_hass()
+
+        state = await self.async_get_last_state()
+        if state:
+            self._state = state.state
+            self._label = state.attributes.get("Label")
+
+        async def message_received(msg):
+            msg_json = json.loads(msg.payload)
+            event = msg_json.get("event")
+            if event != "alarm_rescheduled":
+                return
+
+            value1 = msg_json.get("value1")
+            value2 = msg_json.get("value2")
+            if value1:
+                timestamp = int(value1) / 1000.0
+                dt = dt_util.as_local(datetime.fromtimestamp(timestamp))
+                self._state = dt.strftime("%Y-%m-%d %H:%M")
+            else:
+                self._state = None
+
+            self._label = value2
+            self.async_schedule_update_ha_state()
+
+        await async_subscribe(
+            self._hass,
+            self._hass.data[DOMAIN][self.entry_id][CONF_TOPIC],
+            message_received,
+        )
 
 class SAASSoundSensor(RestoreEntity):
     """Representation of a SAAS - Sleep As Android Stats sensor for Sound Events."""
@@ -817,10 +875,11 @@ async def async_setup_entry(hass, entry, async_add_entities):
     entry_id = entry.entry_id
     hass.data[DOMAIN][entry.entry_id] = entry.data
 
-    entities = [
-        SAASSensor(hass, name, STATE_MAPPING, entry_id),
-        SAASAlarmEventSensor(hass, name, ALARM_EVENT_MAPPING, entry_id),
-        SAASSoundSensor(hass, name, SOUND_MAPPING, entry_id),
+    entities = [
+        SAASSensor(hass, name, STATE_MAPPING, entry_id),
+        SAASAlarmEventSensor(hass, name, ALARM_EVENT_MAPPING, entry_id),
+        SAASNextAlarmSensor(hass, name, entry_id),
+        SAASSoundSensor(hass, name, SOUND_MAPPING, entry_id),
         SAASSleepTrackingSensor(hass, name, SLEEP_TRACKING_MAPPING, entry_id), 
         SAASDisturbanceSensor(hass, name, DISTURBANCE_MAPPING, entry_id),
         SAASLullabySensor(hass, name, LULLABY_MAPPING, entry_id),