diff --git a/Automations/babybuddy.yaml b/Automations/babybuddy.yaml
index bc4d220..fe3143c 100644
--- a/Automations/babybuddy.yaml
+++ b/Automations/babybuddy.yaml
@@ -166,7 +166,7 @@ action:
           - choose:
               - conditions:
                   - condition: template
-                    value_template: "{{ state_attr(_bb_child_last_timer, 'on') }}"
+                    value_template: "{{ state_attr(_bb_child_last_timer, 'active') }}"
                 sequence:
                   - service: babybuddy.add_feeding
                     data:
diff --git a/Automations/babybuddy_nl.yaml b/Automations/babybuddy_nl.yaml
index 289d8ee..f061a81 100644
--- a/Automations/babybuddy_nl.yaml
+++ b/Automations/babybuddy_nl.yaml
@@ -172,7 +172,7 @@ action:
             - choose:
                 - conditions:
                     - condition: template
-                      value_template: "{{ state_attr(_bb_child_last_timer, 'on') }}"
+                      value_template: "{{ state_attr(_bb_child_last_timer, 'active') }}"
                   sequence:
                     - service: babybuddy.add_feeding
                       data:
@@ -181,8 +181,8 @@ action:
                         method: "{{ states('select.baby_buddy_feeding_method') }}"
                         amount: "{{ states(_bb_amount) }}"
                         notes: "{{ states(_bb_notes) }}"
-                      target:
-                        entity_id: !input bb_timer
+##                      target:
+##                        entity_id: !input bb_timer
               default:
                 - service: babybuddy.add_feeding
                   data: