diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index e348dd7..a0c74ca 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -952,6 +952,9 @@
         @Override
         public void notify(DeviceEvent event) {
             post(event);
+            if (event.type().equals(DeviceEvent.Type.DEVICE_REMOVED)) {
+                deviceLocalStatus.remove(event.subject().id());
+            }
         }
     }