diff --git a/server/TracyView_FindZone.cpp b/server/TracyView_FindZone.cpp
index f82d5e1a..7de5f561 100644
--- a/server/TracyView_FindZone.cpp
+++ b/server/TracyView_FindZone.cpp
@@ -1835,7 +1835,7 @@ void View::DrawFindZone()
 
                 bool empty = true;
                 const auto firstTime = samplesBegin->time.Val();
-                const auto lastTime = samplesEnd->time.Val();
+                const auto lastTime = samplesEnd == samples->end() ? m_worker.GetLastTime() : samplesEnd->time.Val();
                 for( auto& g: selectedGroups )
                 {
                     const auto& zones = g.group->zones;