diff --git a/ChangeLog b/ChangeLog
index e80a0c2c79..6f95aa9602 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-23  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Mark Nauwelaerts  <manauw at skynet be>
+
+	* gst/matroska/matroska-mux.c: (gst_matroska_mux_change_state):
+	  gst_collect_pads_stop() needs to be called before chaining up
+	  to the parent class (#342734).
+
 2006-05-23  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/flac/Makefile.am:
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 2b76df0701..5949505345 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -1722,6 +1722,9 @@ gst_matroska_mux_change_state (GstElement * element, GstStateChange transition)
       break;
     case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       break;
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      gst_collect_pads_stop (mux->collect);
+      break;
     default:
       break;
   }
@@ -1732,7 +1735,6 @@ gst_matroska_mux_change_state (GstElement * element, GstStateChange transition)
     case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       break;
     case GST_STATE_CHANGE_PAUSED_TO_READY:
-      gst_collect_pads_stop (mux->collect);
       gst_matroska_mux_reset (GST_ELEMENT (mux));
       break;
     case GST_STATE_CHANGE_READY_TO_NULL: