diff --git a/misc/munin/wormhole_active b/misc/munin/wormhole_active
index 36ffe5e..58edd05 100755
--- a/misc/munin/wormhole_active
+++ b/misc/munin/wormhole_active
@@ -40,7 +40,7 @@ channel_db = sqlite3.connect(channeldbfile)
 
 MINUTE = 60.0
 updated,rebooted = usage_db.execute("SELECT `updated`,`rebooted` FROM `current`").fetchone()
-if time.time() > updated + 11*MINUTE:
+if time.time() > updated + 6*MINUTE:
     sys.exit(1) # expired
 
 nameplates = channel_db.execute("SELECT COUNT() FROM `nameplates`").fetchone()[0]
diff --git a/misc/munin/wormhole_errors b/misc/munin/wormhole_errors
index beeb7de..5716287 100755
--- a/misc/munin/wormhole_errors
+++ b/misc/munin/wormhole_errors
@@ -35,7 +35,7 @@ usage_db = sqlite3.connect(usagedbfile)
 
 MINUTE = 60.0
 updated,rebooted = usage_db.execute("SELECT `updated`,`rebooted` FROM `current`").fetchone()
-if time.time() > updated + 11*MINUTE:
+if time.time() > updated + 6*MINUTE:
     sys.exit(1) # expired
 
 r1 = usage_db.execute("SELECT COUNT() FROM `nameplates`").fetchone()[0]
diff --git a/misc/munin/wormhole_event_rate b/misc/munin/wormhole_event_rate
index b74ef28..4d38204 100755
--- a/misc/munin/wormhole_event_rate
+++ b/misc/munin/wormhole_event_rate
@@ -45,7 +45,7 @@ usage_db = sqlite3.connect(usagedbfile)
 
 MINUTE = 60.0
 updated,rebooted = usage_db.execute("SELECT `updated`,`rebooted` FROM `current`").fetchone()
-if time.time() > updated + 11*MINUTE:
+if time.time() > updated + 6*MINUTE:
     sys.exit(1) # expired
 
 atm = defaultdict(int)
diff --git a/misc/munin/wormhole_events b/misc/munin/wormhole_events
index e1c4c06..720d317 100755
--- a/misc/munin/wormhole_events
+++ b/misc/munin/wormhole_events
@@ -45,7 +45,7 @@ usage_db = sqlite3.connect(usagedbfile)
 MINUTE = 60.0
 updated,rebooted,blur = usage_db.execute(
     "SELECT `updated`,`rebooted`,`blur_time` FROM `current`").fetchone()
-if time.time() > updated + 11*MINUTE:
+if time.time() > updated + 6*MINUTE:
     sys.exit(1) # expired
 if blur is not None:
     rebooted = blur * (rebooted // blur)
diff --git a/misc/munin/wormhole_events_alltime b/misc/munin/wormhole_events_alltime
index 4a56e80..5a8982a 100755
--- a/misc/munin/wormhole_events_alltime
+++ b/misc/munin/wormhole_events_alltime
@@ -44,7 +44,7 @@ usage_db = sqlite3.connect(usagedbfile)
 
 MINUTE = 60.0
 updated,rebooted = usage_db.execute("SELECT `updated`,`rebooted` FROM `current`").fetchone()
-if time.time() > updated + 11*MINUTE:
+if time.time() > updated + 6*MINUTE:
     sys.exit(1) # expired
 
 for mood in ["happy", "scary", "lonely", "errory", "pruney", "crowded"]:
diff --git a/src/wormhole_mailbox_server/server_tap.py b/src/wormhole_mailbox_server/server_tap.py
index f8e5e39..8bd6753 100644
--- a/src/wormhole_mailbox_server/server_tap.py
+++ b/src/wormhole_mailbox_server/server_tap.py
@@ -65,7 +65,7 @@ def opt_websocket_protocol_option(self, arg):
 
 # CHANNEL_EXPIRATION_TIME should be longer than EXPIRATION_CHECK_PERIOD
 CHANNEL_EXPIRATION_TIME = 11*MINUTE
-EXPIRATION_CHECK_PERIOD = 10*MINUTE
+EXPIRATION_CHECK_PERIOD = 5*MINUTE
 
 def makeService(config, channel_db="relay.sqlite", reactor=reactor):
     increase_rlimits()