diff --git a/ChangeLog b/ChangeLog
index df2b9dc5c7..50ea6f9c87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-22  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/playback/gstplaybasebin.c: (gst_play_base_bin_change_state):
+	  Explicit state change to workaround refcount bugs.
+
 2005-01-22  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/avi/gstavimux.c: (gst_avimux_write_tag),
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index fd76660575..05e88ee6b9 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1666,6 +1666,7 @@ gst_play_base_bin_change_state (GstElement * element)
       remove_groups (play_base_bin);
       break;
     case GST_STATE_READY_TO_NULL:
+      gst_element_set_state (play_base_bin->thread, GST_STATE_NULL);
       gst_object_unref (GST_OBJECT (play_base_bin->thread));
       play_base_bin->source = NULL;
       play_base_bin->decoder = NULL;