diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 4bc646cc64..4101a7b7e1 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -667,7 +667,7 @@ Automatable::find_next_event (timepos_t const & start, timepos_t const & end, Ev
 			}
 		}
 	}
-	return next_event.when != (start <= end ? std::numeric_limits<double>::max() : 0);
+	return next_event.when != (start <= end ? timepos_t::max (start.time_domain()) : timepos_t (start.time_domain()));
 }
 
 void