diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c
index 14e0c5a5f..d346bcd9c 100644
--- a/src/examples/media-session/alsa-monitor.c
+++ b/src/examples/media-session/alsa-monitor.c
@@ -667,9 +667,10 @@ static void alsa_remove_device(struct impl *impl, struct device *device)
 		spa_hook_remove(&device->sync_listener);
 	if (device->reserve)
 		rd_device_destroy(device->reserve);
-	if (device->sdevice)
+	if (device->sdevice) {
+		spa_hook_remove(&device->listener);
 		sm_object_destroy(&device->sdevice->obj);
-	spa_hook_remove(&device->listener);
+	}
 	pw_unload_spa_handle(device->handle);
 	pw_properties_free(device->props);
 	free(device);
diff --git a/src/examples/media-session/policy-node.c b/src/examples/media-session/policy-node.c
index 421adf46f..408423161 100644
--- a/src/examples/media-session/policy-node.c
+++ b/src/examples/media-session/policy-node.c
@@ -186,7 +186,6 @@ handle_node(struct impl *impl, struct sm_object *object)
 	node->impl = impl;
 	node->client_id = client_id;
 	node->type = NODE_TYPE_UNKNOWN;
-	node->enabled = true;
 	spa_list_append(&impl->node_list, &node->link);
 
 	if (strstr(media_class, "Stream/") == media_class) {
@@ -250,6 +249,7 @@ handle_node(struct impl *impl, struct sm_object *object)
 				object->id, node->media, node->priority);
 	}
 
+	node->enabled = true;
 	node->obj->obj.mask |= SM_NODE_CHANGE_MASK_PARAMS;
 	sm_object_add_listener(&node->obj->obj, &node->listener, &object_events, node);
 
@@ -259,7 +259,8 @@ handle_node(struct impl *impl, struct sm_object *object)
 static void destroy_node(struct impl *impl, struct node *node)
 {
 	spa_list_remove(&node->link);
-	spa_hook_remove(&node->listener);
+	if (node->enabled)
+		spa_hook_remove(&node->listener);
 	free(node->media);
 	if (node->peer)
 		node->peer->peer = NULL;