diff --git a/rw_core/core/logical_device_manager.go b/rw_core/core/logical_device_manager.go
index b3f313c..035d366 100644
--- a/rw_core/core/logical_device_manager.go
+++ b/rw_core/core/logical_device_manager.go
@@ -192,8 +192,8 @@
 		if ldAgent.rootDeviceId == id {
 			log.Infow("stopping-logical-device-agent", log.Fields{"lDeviceId": key})
 			ldAgent.stop(nil)
-			ldMgr.logicalDeviceAgents.Delete(ldId)
 			ldId = key.(string)
+			ldMgr.logicalDeviceAgents.Delete(ldId)
 		}
 		return true
 	})