diff --git a/portal/trigger_states/empro_domains.py b/portal/trigger_states/empro_domains.py
index d5167c4b4..609c099c9 100644
--- a/portal/trigger_states/empro_domains.py
+++ b/portal/trigger_states/empro_domains.py
@@ -154,7 +154,9 @@ def eval_triggers(self, previous_triggers):
 
         for domain in EMPRO_DOMAINS:
             if domain in self.cur_obs:
-                prev_triggers_for_domain = previous_triggers["domain"][domain] if previous_triggers else None
+                prev_triggers_for_domain = (
+                    previous_triggers["domain"].get(domain)
+                    if previous_triggers else None)
                 dt = DomainTriggers(
                     domain=domain,
                     current_answers=self.cur_obs[domain],
diff --git a/portal/trigger_states/empro_states.py b/portal/trigger_states/empro_states.py
index b2eb79619..59283f10c 100644
--- a/portal/trigger_states/empro_states.py
+++ b/portal/trigger_states/empro_states.py
@@ -212,7 +212,7 @@ def evaluate_triggers(qnr):
         # bring together and evaluate available data for triggers
         dm = DomainManifold(qnr)
         previous_triggers = (
-            previous if previous and previous.visit_month + 1 == ts.visit_month
+            previous.triggers if previous and previous.visit_month + 1 == ts.visit_month
             else None)
         ts.triggers = dm.eval_triggers(previous_triggers)
         ts.questionnaire_response_id = qnr.id