diff --git a/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java b/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java
index 8914a1e..0dc5dbe 100644
--- a/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java
+++ b/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java
@@ -113,7 +113,9 @@
     @Deactivate
     protected void deactivate() {
         routeMonitor.shutdown();
-        listeners.values().forEach(ListenerQueue::stop);
+        synchronized (this) {
+            listeners.values().forEach(ListenerQueue::stop);
+        }
 
         routeStore.unsetDelegate(delegate);
         hostService.removeListener(hostListener);
@@ -176,6 +178,7 @@
         return routeSets.stream().flatMap(r -> r.routes().stream()).collect(Collectors.toList());
     }
 
+    @Override
     public Collection<RouteTableId> getRouteTables() {
         return routeStore.getRouteTables();
     }