diff --git a/core/artists/map.py b/core/artists/map.py
index 5e6f130a..c2ceb0c5 100644
--- a/core/artists/map.py
+++ b/core/artists/map.py
@@ -20,10 +20,14 @@ logger = logging.getLogger(__name__)
 
 
 def get_current_profile_id() -> int:
-    """Mirror of web_server.get_current_profile_id — uses Flask g."""
+    """Mirror of web_server.get_current_profile_id — uses Flask g.
+
+    Catches RuntimeError too because reading `g` outside a request
+    context raises that (not AttributeError) — happens when this is
+    called from background threads (sync, automation, scanners)."""
     try:
         return g.profile_id
-    except AttributeError:
+    except (AttributeError, RuntimeError):
         return 1
 
 
diff --git a/core/discovery/hero.py b/core/discovery/hero.py
index 50800ecb..41143924 100644
--- a/core/discovery/hero.py
+++ b/core/discovery/hero.py
@@ -17,10 +17,14 @@ logger = logging.getLogger(__name__)
 
 
 def get_current_profile_id() -> int:
-    """Mirror of web_server.get_current_profile_id — uses Flask g."""
+    """Mirror of web_server.get_current_profile_id — uses Flask g.
+
+    Catches RuntimeError too because reading `g` outside a request
+    context raises that (not AttributeError) — happens when this is
+    called from background threads (sync, automation, scanners)."""
     try:
         return g.profile_id
-    except AttributeError:
+    except (AttributeError, RuntimeError):
         return 1
 
 
diff --git a/web_server.py b/web_server.py
index 25bec6c7..a29ff3bd 100644
--- a/web_server.py
+++ b/web_server.py
@@ -474,10 +474,16 @@ def _add_discover_cache_headers(response):
 
 
 def get_current_profile_id() -> int:
-    """Get the current profile ID from Flask g context or default to 1"""
+    """Get the current profile ID from Flask g context or default to 1.
+
+    Background callers (automation engine, sync threads, watchlist
+    scanner) have no request context, so `g.profile_id` raises
+    `RuntimeError("Working outside of application context")` rather
+    than `AttributeError`. Catch both so non-request callers degrade
+    to the admin profile instead of crashing the handler."""
     try:
         return g.profile_id
-    except AttributeError:
+    except (AttributeError, RuntimeError):
         return 1