diff --git a/src/auto4_lua.cpp b/src/auto4_lua.cpp
index 4093c6516..ecd5355da 100644
--- a/src/auto4_lua.cpp
+++ b/src/auto4_lua.cpp
@@ -820,7 +820,7 @@ namespace {
 						++prev;
 						++it;
 					}
-					if (row != prev) break;
+					if (it == c->ass->Events.end()) break;
 					new_sel.insert(&*it);
 					if (row == original_active)
 						new_active = &*it;