diff --git a/subprojects/gstreamer/gst/gstsegment.c b/subprojects/gstreamer/gst/gstsegment.c
index 72f8db1fe7..e2ec99a3f3 100644
--- a/subprojects/gstreamer/gst/gstsegment.c
+++ b/subprojects/gstreamer/gst/gstsegment.c
@@ -770,8 +770,8 @@ gst_segment_to_running_time_full (const GstSegment * segment, GstFormat format,
       stop = segment->start + segment->duration;
 
     /* cannot continue if no stop position set or invalid offset */
-    g_return_val_if_fail (stop != -1, 0);
-    g_return_val_if_fail (stop >= offset, 0);
+    if (stop == -1 || stop < offset)
+      return 0;
 
     stop -= offset;