diff --git a/edc_adverse_event/view_mixins/ae/ae_listboard_view_mixin.py b/edc_adverse_event/view_mixins/ae/ae_listboard_view_mixin.py
index 4822d24..af5553e 100644
--- a/edc_adverse_event/view_mixins/ae/ae_listboard_view_mixin.py
+++ b/edc_adverse_event/view_mixins/ae/ae_listboard_view_mixin.py
@@ -114,13 +114,14 @@ def print_pdf_report(self, action_identifier=None, request=None):
         return None
 
     def get_context_data(self, **kwargs) -> dict:
-        context = super().get_context_data(**kwargs)
-        context = self.add_url_to_context(
-            new_key="ae_home_url", existing_key=self.home_url, context=context
+        kwargs.update(
+            {
+                "AE_INITIAL_ACTION": AE_INITIAL_ACTION,
+                "utc_date": get_utcnow().date(),
+                **self.add_url_to_context(new_key="ae_home_url", existing_key=self.home_url),
+            }
         )
-        context["AE_INITIAL_ACTION"] = AE_INITIAL_ACTION
-        context["utc_date"] = get_utcnow().date()
-        return context
+        return super().get_context_data(**kwargs)
 
     def get_queryset_filter_options(self, request, *args, **kwargs):
         options = super().get_queryset_filter_options(request, *args, **kwargs)
diff --git a/edc_adverse_event/view_mixins/ae/death_report_listboard_view_mixin.py b/edc_adverse_event/view_mixins/ae/death_report_listboard_view_mixin.py
index e7c0530..c308c56 100644
--- a/edc_adverse_event/view_mixins/ae/death_report_listboard_view_mixin.py
+++ b/edc_adverse_event/view_mixins/ae/death_report_listboard_view_mixin.py
@@ -100,13 +100,17 @@ def print_pdf_report(self, action_identifier=None, request=None):
         return None
 
     def get_context_data(self, **kwargs) -> dict:
-        context = super().get_context_data(**kwargs)
-        context = self.add_url_to_context(
-            new_key="ae_home_url", existing_key=self.home_url, context=context
+        kwargs.update(
+            {
+                "DEATH_REPORT_ACTION": DEATH_REPORT_ACTION,
+                "utc_date": get_utcnow().date(),
+                **self.add_url_to_context(
+                    new_key="ae_home_url",
+                    existing_key=self.home_url,
+                ),
+            },
         )
-        context["DEATH_REPORT_ACTION"] = DEATH_REPORT_ACTION
-        context["utc_date"] = get_utcnow().date()
-        return context
+        return kwargs
 
     def get_queryset_filter_options(self, request, *args, **kwargs):
         options = super().get_queryset_filter_options(request, *args, **kwargs)
diff --git a/edc_adverse_event/views/home_view.py b/edc_adverse_event/views/home_view.py
index 2f67638..664f7b8 100644
--- a/edc_adverse_event/views/home_view.py
+++ b/edc_adverse_event/views/home_view.py
@@ -15,18 +15,15 @@ class AeHomeView(UrlRequestContextMixin, EdcViewMixin, NavbarViewMixin, Template
     url_name = "ae_home_url"
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data()
-        context = self.add_url_to_context(
-            new_key="ae_home_url", existing_key=self.url_name, context=context
-        )
-        context.update(ADVERSE_EVENT_ADMIN_SITE=ADVERSE_EVENT_ADMIN_SITE)
-        context.update(ADVERSE_EVENT_APP_LABEL=ADVERSE_EVENT_APP_LABEL)
         app_list_url = f"{ADVERSE_EVENT_ADMIN_SITE}:app_list"
         ae_listboard_url = url_names.get(self.ae_listboard_url)
         death_report_listboard_url = url_names.get(self.death_report_listboard_url)
-        context.update(
+        kwargs.update(
+            ADVERSE_EVENT_ADMIN_SITE=ADVERSE_EVENT_ADMIN_SITE,
+            ADVERSE_EVENT_APP_LABEL=ADVERSE_EVENT_APP_LABEL,
             app_list_url=app_list_url,
             ae_listboard_url=ae_listboard_url,
             death_report_listboard_url=death_report_listboard_url,
+            **self.add_url_to_context(new_key="ae_home_url", existing_key=self.url_name),
         )
-        return context
+        return super().get_context_data(**kwargs)