diff --git a/panel-plugin/pulseaudio-volume.c b/panel-plugin/pulseaudio-volume.c
index c181ae5..77eff73 100644
--- a/panel-plugin/pulseaudio-volume.c
+++ b/panel-plugin/pulseaudio-volume.c
@@ -209,8 +209,10 @@ pulseaudio_volume_sink_info_cb (pa_context         *context,
       pulseaudio_debug ("Updated Mute: %d -> %d", volume->muted, muted);
       volume->muted = muted;
 
-      if (volume->sink_connected)
+      if (volume->sink_connected && !pulseaudio_config_get_enable_multimedia_keys (volume->config))
         g_signal_emit (G_OBJECT (volume), pulseaudio_volume_signals [VOLUME_CHANGED], 0, TRUE);
+      else
+        g_signal_emit (G_OBJECT (volume), pulseaudio_volume_signals [VOLUME_CHANGED], 0, FALSE);
     }
 
   if (ABS (volume->volume - vol) > 2e-3)
@@ -218,8 +220,10 @@ pulseaudio_volume_sink_info_cb (pa_context         *context,
       pulseaudio_debug ("Updated Volume: %04.3f -> %04.3f", volume->volume, vol);
       volume->volume = vol;
 
-      if (volume->sink_connected)
+      if (volume->sink_connected && !pulseaudio_config_get_enable_multimedia_keys (volume->config))
         g_signal_emit(G_OBJECT(volume), pulseaudio_volume_signals[VOLUME_CHANGED], 0, TRUE);
+      else
+        g_signal_emit (G_OBJECT (volume), pulseaudio_volume_signals [VOLUME_CHANGED], 0, FALSE);
     }
 
   pulseaudio_debug ("volume: %f, muted: %d", vol, muted);