diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
index f461269..b6c921e 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
@@ -138,6 +138,8 @@
 
     private TunnellingConnectivityManager connectivityManager;
 
+    private IcmpHandler icmpHandler;
+
     private InternalTableHandler provisionStaticTables = new InternalTableHandler();
 
     @Activate
@@ -154,10 +156,14 @@
                                                                 packetService,
                                                                 flowService);
 
+        icmpHandler = new IcmpHandler(configService, packetService);
+
         routingService.start(new InternalFibListener());
 
         connectivityManager.start();
 
+        icmpHandler.start();
+
         log.info("BgpRouter started");
     }
 
@@ -165,6 +171,7 @@
     protected void deactivate() {
         routingService.stop();
         connectivityManager.stop();
+        icmpHandler.stop();
         provisionStaticTables.provision(false, configService.getInterfaces());
 
         groupService.removeListener(groupListener);
@@ -186,6 +193,7 @@
             deviceId = s.interfaceAddresses().get(0).connectPoint().deviceId();
             break;
         }
+
         log.info("Router dpid: {}", deviceId);
         log.info("Control Plane OVS dpid: {}", ctrlDeviceId);
     }