diff --git a/ChangeLog b/ChangeLog
index e79e7ffd35..95f59b019d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/playback/gstplaybasebin.c: (setup_source):
+	  Fix hanging subs.
+
 2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/playback/gstplaybasebin.c: (gst_play_base_bin_init),
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 90e675ef94..a3cedd0ade 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1126,9 +1126,9 @@ setup_source (GstPlayBaseBin * play_base_bin, GError ** error)
 
     /* don't add yet, because we will preroll, and subs shouldn't
      * preroll (we shouldn't preroll more than once source). */
+    gst_element_set_state (subbin, GST_STATE_PAUSED);
     new_decoded_pad (subbin, gst_element_get_pad (subbin, "src"), FALSE,
         play_base_bin);
-    gst_element_set_state (subbin, GST_STATE_PAUSED);
   }
 
   /* now see if the source element emits raw audio/video all by itself,