diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c
index 715e6f4dd4..8a81cfa79c 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c
@@ -380,6 +380,9 @@ device_removed(void* cookie)
 	}
 
 	bdev->connected = false;
+	
+	// TODO: place this in the appropiated hook
+	// kill_device(bdev);
 
 	return B_OK;
 }
@@ -577,8 +580,6 @@ device_free (void *cookie)
 		   connected, so remove it from the list. */
 	}
 
-	kill_device(bdev);
-
 	return err;
 }