diff --git a/src/gst/gstpipewireclock.c b/src/gst/gstpipewireclock.c
index 10607c3e7..fc7e72448 100644
--- a/src/gst/gstpipewireclock.c
+++ b/src/gst/gstpipewireclock.c
@@ -22,6 +22,7 @@ gst_pipewire_clock_new (GstPipeWireStream *stream, GstClockTime last_time)
   g_weak_ref_set (&clock->stream, stream);
   clock->last_time = last_time;
   clock->time_offset = last_time;
+  clock->start_time_valid = false;
 
   return GST_CLOCK_CAST (clock);
 }
@@ -38,14 +39,26 @@ gst_pipewire_clock_get_internal_time (GstClock * clock)
     return pclock->last_time;
 
   now = pw_stream_get_nsec(s->pwstream);
+
 #if 1
   struct pw_time t;
   if (s->pwstream == NULL ||
       pw_stream_get_time_n (s->pwstream, &t, sizeof(t)) < 0 ||
-      t.rate.denom == 0)
-    return pclock->last_time;
+      t.rate.denom == 0) {
+        pclock->start_time_valid = false;
+        if (now < pclock->last_time)
+          return pclock->last_time;
+        return now;
+  }
 
-  result = gst_util_uint64_scale (t.ticks, GST_SECOND * t.rate.num, t.rate.denom);
+  uint64_t elapsed = gst_util_uint64_scale (t.ticks, GST_SECOND * t.rate.num, t.rate.denom);
+
+  if (!pclock->start_time_valid) {
+    pclock->start_time = t.now - elapsed;
+    pclock->start_time_valid = true;
+  }
+
+  result = pclock->start_time + elapsed;
   result += now - t.now;
 
   result += pclock->time_offset;
diff --git a/src/gst/gstpipewireclock.h b/src/gst/gstpipewireclock.h
index 8b41598ef..8b916ccca 100644
--- a/src/gst/gstpipewireclock.h
+++ b/src/gst/gstpipewireclock.h
@@ -22,6 +22,8 @@ struct _GstPipeWireClock {
   GWeakRef stream;
 
   GstClockTime last_time;
+  GstClockTime start_time;
+  bool start_time_valid;
   GstClockTimeDiff time_offset;
 };