diff --git a/ChangeLog b/ChangeLog
index 946fabc0cc..73a6b8569a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-17  Wim Taymans  <wim@fluendo.com>
+
+	* tools/gst-launch.c: (event_loop):
+	Message was unreffed too soon.
+
 2005-05-16  Andy Wingo  <wingo@pobox.com>
 
 	* gst/gstbin.c (sink_iterator_filter): Err... um...
diff --git a/tools/gst-launch.c b/tools/gst-launch.c
index 76a7d41327..b363aea652 100644
--- a/tools/gst-launch.c
+++ b/tools/gst-launch.c
@@ -391,13 +391,15 @@ event_loop (GstElement * pipeline, gboolean blocking)
         GstElementState old, new;
 
         gst_message_parse_state_changed (message, &old, &new);
-        gst_message_unref (message);
-        if (!(old == GST_STATE_PLAYING && new == GST_STATE_PAUSED))
+        if (!(old == GST_STATE_PLAYING && new == GST_STATE_PAUSED)) {
+          gst_message_unref (message);
           break;
+        }
         g_print (_
             ("Element \"%s\" has gone from PLAYING to PAUSED, quitting.\n"),
             GST_STR_NULL (GST_ELEMENT_NAME (GST_MESSAGE_SRC (message))));
         /* cut out of the event loop if check_intr set us to PAUSED */
+        gst_message_unref (message);
         return FALSE;
       }
       default: