diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp
index a56c1e132..728d381f1 100644
--- a/src/libslic3r/GCode/GCodeProcessor.cpp
+++ b/src/libslic3r/GCode/GCodeProcessor.cpp
@@ -3566,7 +3566,7 @@ void GCodeProcessor::post_process()
                 ++m_curr_g1_id;
             }
 
-            if (it != init_it || m_curr_g1_id == 0)
+            if ((it != m_machine.g1_times_cache.end() && it != init_it) || m_curr_g1_id == 0)
                 m_time = it->elapsed_time;
         }