diff --git a/app/modules/services/ui.py b/app/modules/services/ui.py
index 3a168ba..aee9a97 100644
--- a/app/modules/services/ui.py
+++ b/app/modules/services/ui.py
@@ -2540,7 +2540,15 @@ def sync_system_default_tasks_for_firm(request: Request, catalogue_id: int):
         if not roles.intersection({"System Admin", "Firm Admin"}):
             return RedirectResponse(url="/services", status_code=303)
 
-        tenant_id = _tenant_id(request, current_user)
+        tenant_id = (
+            getattr(request.state, "active_tenant_id", None)
+            or getattr(request.state, "tenant_id", None)
+            or getattr(current_user, "tenant_id", None)
+        )
+        if not tenant_id:
+            raise RuntimeError(
+                "Active tenant could not be resolved for system-default task sync."
+            )
         result = sync_firm_tasks_from_system_defaults(
             db,
             tenant_id=tenant_id,