diff --git a/esphome/epaperframe.yaml b/esphome/epaperframe.yaml
index 3b1cba5..6d37a58 100644
--- a/esphome/epaperframe.yaml
+++ b/esphome/epaperframe.yaml
@@ -197,12 +197,14 @@ sensor:
 text_sensor:
   - platform: homeassistant
     name: "Sun Rising ESP"
+    #entity_id: sensor.sun_next_rising
     entity_id: sensor.sun_rising_template
     id: sun_rising
     internal: true
     
   - platform: homeassistant
     name: "Sun Setting ESP"
+    #entity_id: sensor.sun_next_setting
     entity_id: sensor.sun_setting_template
     id: sun_setting
     internal: true
diff --git a/recorder.yaml b/recorder.yaml
index aa02142..c0ba529 100644
--- a/recorder.yaml
+++ b/recorder.yaml
@@ -31,6 +31,7 @@
       - sensor.*_uptime
     entities:
       - sun.sun # Don't record sun data
+      - sensor.sun*
       - sensor.fritzbox_device_uptime
       - sensor.time
       - sensor.awtrix_kitchen_current_app