diff --git a/kiosk/src/onvif_events.rs b/kiosk/src/onvif_events.rs
index b4bb973..4760cb1 100644
--- a/kiosk/src/onvif_events.rs
+++ b/kiosk/src/onvif_events.rs
@@ -27,6 +27,12 @@ use crate::bundle::BundleCamera;
 /// to know when to stop (camera removed from bundle / bundle changed).
 static ACTIVE: Mutex<Option<HashMap<u32, ()>>> = Mutex::new(None);
 
+/// Holds the current generation Arc. When start() replaces it, the old
+/// Arc drops → old threads' Weak::upgrade() returns None → they exit.
+/// Previous code used std::mem::forget which leaked the Arc and kept
+/// old threads alive forever.
+static GENERATION: Mutex<Option<Arc<()>>> = Mutex::new(None);
+
 /// Subscription status per camera — reported in heartbeat for admin visibility.
 static STATUS: Mutex<Option<HashMap<u32, SubStatus>>> = Mutex::new(None);
 
@@ -98,6 +104,9 @@ pub fn start(
     drop(active);
 
     let generation = Arc::new(());
+    // Store in static — replaces old generation → old Arc drops → old
+    // threads' Weak::upgrade() returns None → they exit cleanly.
+    *GENERATION.lock().unwrap() = Some(generation.clone());
 
     for cam in onvif_cams {
         let server = server_url.to_string();
@@ -112,11 +121,6 @@ pub fn start(
             run_subscription(cam, password.as_deref(), &server, &key, weak_gen);
         });
     }
-
-    // Keep the Arc alive as long as the bundle is current. When a new
-    // start() is called the old Arc drops and Weak::upgrade returns None,
-    // signalling old threads to exit.
-    std::mem::forget(generation);
 }
 
 fn run_subscription(
@@ -184,8 +188,9 @@ fn run_subscription(
                 }
                 Err(e) => {
                     warn!("onvif-events: cam {} pull failed: {e}", cam.id);
-                    std::thread::sleep(Duration::from_secs(5));
-                    break; // resubscribe
+                    set_status(cam.id, "failed", Some(e));
+                    std::thread::sleep(Duration::from_secs(15));
+                    break; // resubscribe after backoff
                 }
             }
 
@@ -265,11 +270,39 @@ fn create_pullpoint(url: &str, user: &str, pass: &str) -> Result<Subscription, S
 </tev:CreatePullPointSubscription>"#,
     );
     let xml = soap_post(url, "http://www.onvif.org/ver10/events/wsdl/EventPortType/CreatePullPointSubscriptionRequest", &body)?;
-    let address = extract_tag(&xml, "Address")
-        .ok_or_else(|| "no Address in CreatePullPointSubscription response".to_string())?;
+    // Camera may use namespaced Address: <wsa5:Address>, <a:Address>,
+    // <wsa:Address>, or plain <Address>. Try all.
+    let address = extract_tag_ns(&xml, "Address")
+        .filter(|a| !a.is_empty() && a.starts_with("http"))
+        .ok_or_else(|| {
+            // Log first 300 chars of response for debugging.
+            let preview: String = xml.chars().take(300).collect();
+            format!("no Address in CreatePullPoint response: {preview}")
+        })?;
     Ok(Subscription { address })
 }
 
+/// Extract tag content, trying with and without namespace prefixes.
+fn extract_tag_ns(xml: &str, tag: &str) -> Option<String> {
+    // Try common namespace prefixes for ONVIF/WS-Addressing.
+    for prefix in &["", "wsa5:", "wsa:", "a:", "wsnt:", "tev:", "tt:"] {
+        let full = format!("{prefix}{tag}");
+        if let Some(val) = extract_tag(xml, &full) {
+            if !val.is_empty() { return Some(val); }
+        }
+    }
+    // Fallback: regex-style scan for any :Address> content.
+    let pattern = format!(":{tag}>");
+    if let Some(pos) = xml.find(&pattern) {
+        let after = &xml[pos + pattern.len()..];
+        if let Some(end) = after.find('<') {
+            let val = after[..end].trim();
+            if !val.is_empty() { return Some(val.to_string()); }
+        }
+    }
+    None
+}
+
 fn pull_messages(sub_url: &str, user: &str, pass: &str) -> Result<Vec<OnvifEvent>, String> {
     let header = wsse_header(user, pass);
     let body = soap_envelope(