diff --git a/node.lua b/node.lua
index 5627bcb..bb7f74f 100644
--- a/node.lua
+++ b/node.lua
@@ -73,8 +73,6 @@ local function check_next_talks()
 
     all_next_talks = {}
 
-    local min_start = time - 25 * 60
-
     for idx = 1, #schedule do
         local talk = schedule[idx]
 
diff --git a/tile.lua b/tile.lua
index 411cb32..1bd72e8 100644
--- a/tile.lua
+++ b/tile.lua
@@ -122,9 +122,9 @@ local function check_next_talks()
 
         -- Ignore all talks that have already ended here. We don't want
         -- to announce these.
-        if talk.end_ts > time then
+        if talk.end_ts > time and talk.start_ts > min_start then
             -- is this in *this* room, or somewhere else?
-            if current_room and talk.room == current_room and talk.start_ts > min_start then
+            if current_room and talk.room == current_room then
                 room_next_talks[#room_next_talks+1] = talk
             end
             all_next_talks[#all_next_talks+1] = talk