diff --git a/ChangeLog b/ChangeLog
index c17c62509c..5236d6088f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-13  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	Patch by: Laszlo Pandy <laszlok2 at gmail dot com>
+
+	* ext/pulse/pulsemixer.c: (gst_pulsemixer_set_property):
+	Fix property probing after the device property is set by calling
+	set_server when the server property changes. Fixes bug #547518.
+
 2008-08-13  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	Patch by: Laszlo Pandy <laszlok2 at gmail dot com>
diff --git a/ext/pulse/pulsemixer.c b/ext/pulse/pulsemixer.c
index edd3bb2581..a8e2cda2d2 100644
--- a/ext/pulse/pulsemixer.c
+++ b/ext/pulse/pulsemixer.c
@@ -207,15 +207,15 @@ gst_pulsemixer_set_property (GObject * object,
     case PROP_SERVER:
       g_free (this->server);
       this->server = g_value_dup_string (value);
+
+      if (this->probe)
+        gst_pulseprobe_set_server (this->probe, this->server);
+
       break;
 
     case PROP_DEVICE:
       g_free (this->device);
       this->device = g_value_dup_string (value);
-
-      if (this->probe)
-        gst_pulseprobe_set_server (this->probe, this->device);
-
       break;
 
     default: