diff --git a/src/system/kernel/device_manager/legacy_drivers.cpp b/src/system/kernel/device_manager/legacy_drivers.cpp
index 2047143ec2..c1e11b324f 100644
--- a/src/system/kernel/device_manager/legacy_drivers.cpp
+++ b/src/system/kernel/device_manager/legacy_drivers.cpp
@@ -1184,7 +1184,7 @@ LegacyDevice::Removed()
 {
 	RecursiveLocker _(sLock);
 
-	if (!fRemovedFromParent)
+	if (!fRemovedFromParent && fDriver != NULL)
 		fDriver->devices.Remove(this);
 
 	delete this;