diff --git a/aw-server/aw-worktime-autoheal.sh b/aw-server/aw-worktime-autoheal.sh
index eb7c931..0b06bac 100644
--- a/aw-server/aw-worktime-autoheal.sh
+++ b/aw-server/aw-worktime-autoheal.sh
@@ -106,7 +106,7 @@ for i,ts in enumerate(keys):
     cur=parse(ts)
     nxt=parse(keys[i+1]) if i+1<len(keys) else None
     dur=max(0.0,(nxt-cur).total_seconds()) if nxt else 10.0
-    dur=min(3600.0, dur if dur>0 else 10.0)
+    dur=min(30.0, dur if dur>0 else 10.0)
     act=[]
     for r in by[ts]:
         d=r.get("data") or {}
diff --git a/aw-server/aw-worktime-ui-bridge.py b/aw-server/aw-worktime-ui-bridge.py
index b77a636..cabd932 100644
--- a/aw-server/aw-worktime-ui-bridge.py
+++ b/aw-server/aw-worktime-ui-bridge.py
@@ -132,7 +132,7 @@ def transform(events):
                 duration = max(0.0, (next_dt - cur_dt).total_seconds())
             if duration <= 0:
                 duration = 10.0
-        duration = min(duration, 3600.0)
+        duration = min(duration, 30.0)
         active_users = []
         for r in rows:
             data = r.get("data") or {}