diff --git a/src/audio.c b/src/audio.c
index c95b7f7d5..402d6bc28 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -56,6 +56,8 @@ void initAudioDriver(void)
 	ConfigParam *param = NULL;
 	unsigned int i;
 
+	notify_init(&audio_output_client_notify);
+
 	audioOutputArraySize = audio_output_count();
 	audioOutputArray = xmalloc(sizeof(struct audio_output) * audioOutputArraySize);
 
@@ -182,6 +184,8 @@ void finishAudioDriver(void)
 	free(audioOutputArray);
 	audioOutputArray = NULL;
 	audioOutputArraySize = 0;
+
+	notify_deinit(&audio_output_client_notify);
 }
 
 bool
diff --git a/src/output_control.c b/src/output_control.c
index 10ad0df51..26e9b3cd3 100644
--- a/src/output_control.c
+++ b/src/output_control.c
@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-struct notify audio_output_client_notify = NOTIFY_INITIALIZER;
+struct notify audio_output_client_notify;
 
 static void ao_command_wait(struct audio_output *ao)
 {