--- a/media/libcubeb/src/cubeb_audiounit.c
+++ b/media/libcubeb/src/cubeb_audiounit.c
@@ -281,48 +281,48 @@ audiounit_install_device_changed_callbac
   if (r != noErr) {
     return CUBEB_ERROR;
   }
 
   return CUBEB_OK;
 }
 
 static int
-audiounit_uninstall_device_changed_callback()
+audiounit_uninstall_device_changed_callback(cubeb_stream * stm)
 {
   OSStatus r;
   AudioDeviceID id;
 
   AudioObjectPropertyAddress datasource_address = {
     kAudioDevicePropertyDataSource,
     kAudioObjectPropertyScopeGlobal,
     kAudioObjectPropertyElementMaster
   };
 
   if (audiounit_get_output_device_id(&id) != noErr) {
     return CUBEB_ERROR;
   }
 
   r = AudioObjectRemovePropertyListener(id, &datasource_address,
                                         &audiounit_property_listener_callback,
-                                        NULL);
+                                        stm);
   if (r != noErr) {
     return CUBEB_ERROR;
   }
 
   AudioObjectPropertyAddress default_device_address = {
     kAudioHardwarePropertyDefaultOutputDevice,
     kAudioObjectPropertyScopeGlobal,
     kAudioObjectPropertyElementMaster
   };
 
   r = AudioObjectRemovePropertyListener(kAudioObjectSystemObject,
                                         &default_device_address,
                                         &audiounit_property_listener_callback,
-                                        NULL);
+                                        stm);
   if (r != noErr) {
     return CUBEB_ERROR;
   }
 
   return CUBEB_OK;
 }
 
 /* Get the acceptable buffer size (in frames) that this device can work with. */
@@ -656,17 +656,17 @@ audiounit_stream_destroy(cubeb_stream * 
     AudioUnitUninitialize(stm->unit);
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
     CloseComponent(stm->unit);
 #else
     AudioComponentInstanceDispose(stm->unit);
 #endif
   }
 
-  audiounit_uninstall_device_changed_callback();
+  audiounit_uninstall_device_changed_callback(stm);
 
   r = pthread_mutex_destroy(&stm->mutex);
   assert(r == 0);
 
   pthread_mutex_lock(&stm->context->mutex);
   assert(stm->context->active_streams >= 1);
   stm->context->active_streams -= 1;
   pthread_mutex_unlock(&stm->context->mutex);