diff --git a/ChangeLog b/ChangeLog
index 748ff82987..7cba0d303a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-18  Thijs Vermeir  <thijsvermeir@gmail.com>
+
+	* gst/udp/gstmultiudpsink.c:
+	Don't try to leave a multicast group with an invalid socket
+
 2008-01-17  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/flac/gstflacdec.c:
diff --git a/common b/common
index 0efbab89d3..a78a9496c0 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 0efbab89d333b5d07cc7da1a501c38edf5bb4f72
+Subproject commit a78a9496c0c8cd815dda3d8d6127f0a654665abf
diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c
index d36b6967b8..be8d48466b 100644
--- a/gst/udp/gstmultiudpsink.c
+++ b/gst/udp/gstmultiudpsink.c
@@ -727,7 +727,8 @@ gst_multiudpsink_remove (GstMultiUDPSink * sink, const gchar * host, gint port)
   g_get_current_time (&now);
   client->disconnect_time = GST_TIMEVAL_TO_TIME (now);
 
-  if (client->multi_addr.imr_multiaddr.s_addr && sink->auto_multicast)
+  if (*(client->sock) != -1 && client->multi_addr.imr_multiaddr.s_addr
+      && sink->auto_multicast)
     leave_multicast (client);
 
   /* Unlock to emit signal before we delete the actual client */