diff --git a/providers/host/src/main/java/org/onlab/onos/provider/host/impl/HostLocationProvider.java b/providers/host/src/main/java/org/onlab/onos/provider/host/impl/HostLocationProvider.java
index 8821d76..296d300 100644
--- a/providers/host/src/main/java/org/onlab/onos/provider/host/impl/HostLocationProvider.java
+++ b/providers/host/src/main/java/org/onlab/onos/provider/host/impl/HostLocationProvider.java
@@ -109,6 +109,7 @@
     public void deactivate() {
         providerRegistry.unregister(this);
         pktService.removeProcessor(processor);
+        deviceService.removeListener(deviceListener);
         providerService = null;
         log.info("Stopped");
     }