diff --git a/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c b/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c
index 5bc37c6027..d1e469ad0d 100644
--- a/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c
+++ b/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c
@@ -3620,39 +3620,8 @@ on_timeout_common (GObject * session, GObject * source, GstRTSPStream * stream)
   GST_WARNING_OBJECT (src, "source %08x, stream %08x in session %u timed out",
       ssrc, stream->ssrc, stream->id);
 
-  if (ssrc == stream->ssrc) {
-    GList *walk;
-    gboolean all_eos = TRUE;
-
-    GST_DEBUG_OBJECT (src, "setting stream for session %u to EOS", stream->id);
-    stream->eos = TRUE;
-
-    /* Only EOS all streams at once if they're all EOS. Otherwise it is
-     * possible for timed out streams to reappear at a later time time: they
-     * might just be inactive currently.
-     */
-
-    for (walk = src->streams; walk; walk = g_list_next (walk)) {
-      GstRTSPStream *stream = (GstRTSPStream *) walk->data;
-
-      /* Skip streams that were not set up at all */
-      if (!stream->setup)
-        continue;
-
-      if (!stream->eos) {
-        all_eos = FALSE;
-        break;
-      }
-    }
-
-    if (all_eos) {
-      GST_DEBUG_OBJECT (src, "sending EOS on all streams");
-      for (walk = src->streams; walk; walk = g_list_next (walk)) {
-        GstRTSPStream *stream = (GstRTSPStream *) walk->data;
-        gst_rtspsrc_stream_push_event (src, stream, gst_event_new_eos ());
-      }
-    }
-  }
+  if (ssrc == stream->ssrc)
+    gst_rtspsrc_do_stream_eos (src, stream);
 }
 
 static void
@@ -3693,8 +3662,6 @@ on_ssrc_active (GObject * session, GObject * source, GstRTSPStream * stream)
 {
   GST_DEBUG_OBJECT (stream->parent, "source in session %u is active",
       stream->id);
-
-  stream->eos = FALSE;
 }
 
 static void