diff --git a/src/modules/spa/spa-device.c b/src/modules/spa/spa-device.c
index 92d46bd65..684126755 100644
--- a/src/modules/spa/spa-device.c
+++ b/src/modules/spa/spa-device.c
@@ -50,7 +50,7 @@ struct impl {
 	void *user_data;
 };
 
-static void device_destroy(void *data)
+static void device_free(void *data)
 {
 	struct impl *impl = data;
 	struct pw_impl_device *device = impl->this;
@@ -64,7 +64,7 @@ static void device_destroy(void *data)
 
 static const struct pw_impl_device_events device_events = {
 	PW_VERSION_IMPL_DEVICE_EVENTS,
-	.destroy = device_destroy,
+	.free = device_free,
 };
 
 struct pw_impl_device *
diff --git a/src/pipewire/impl-device.c b/src/pipewire/impl-device.c
index 0342f337b..9e9c70081 100644
--- a/src/pipewire/impl-device.c
+++ b/src/pipewire/impl-device.c
@@ -190,9 +190,9 @@ void pw_impl_device_destroy(struct pw_impl_device *device)
 	if (device->registered)
 		spa_list_remove(&device->link);
 
-	if (device->device) {
+	if (device->device)
 		spa_hook_remove(&device->listener);
-	}
+
 	if (device->global) {
 		spa_hook_remove(&device->global_listener);
 		pw_global_destroy(device->global);