diff --git a/src/servers/input/DeviceManager.cpp b/src/servers/input/DeviceManager.cpp
index 746a1c5bab..0798e6cc90 100644
--- a/src/servers/input/DeviceManager.cpp
+++ b/src/servers/input/DeviceManager.cpp
@@ -242,7 +242,7 @@ DeviceManager::StopMonitoringDevice(_BDeviceAddOn_ *addon,
 	BDirectory directory;
 	BPath path("/dev");
 	if (((err = path.Append(device)) != B_OK)
-		|| ((err = directory.SetTo(path.Path())) != B_OK) 
+		|| ((err = directory.SetTo(path.Path())) != B_OK)
 		|| ((err = directory.GetNodeRef(&nref)) != B_OK))
 		return err;
 		
@@ -263,7 +263,7 @@ DeviceManager::StopMonitoringDevice(_BDeviceAddOn_ *addon,
 			}
 		}
 		if (stillMonitored)
-			break;				
+			break;
 	}
 	
 	// remove from list
@@ -277,6 +277,10 @@ DeviceManager::StopMonitoringDevice(_BDeviceAddOn_ *addon,
 		}
 		j++;
 	}
+
+	if (addon->fMonitoredRefs.IsEmpty()) {
+		fDeviceAddons.RemoveItem(addon);
+	}
 	
 	// stop monitoring if needed
 	if (!stillMonitored) {