diff --git a/server/devicemanager.cpp b/server/devicemanager.cpp
index bbcca22..1c990a6 100644
--- a/server/devicemanager.cpp
+++ b/server/devicemanager.cpp
@@ -103,14 +103,12 @@ void DeviceManager::createHostDevices(void)
 
 DeviceManager::~DeviceManager()
 {
+    // Delete *all* devices - host and enumerated
     foreach(Device *dev, deviceList_)
         delete dev;
 
     foreach(OstProto::DeviceGroup *devGrp, deviceGroupList_)
         delete devGrp;
-
-    foreach(Device *dev, hostDeviceList_)
-        delete dev;
 }
 
 int DeviceManager::deviceGroupCount()