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 3266ac1..a17046f 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
@@ -331,7 +331,8 @@
 
         Group group = groupService.getGroup(deviceId, nextHop.group());
 
-        if (nextHopsCount.remove(nextHopIp, 1) <= 1) {
+        // FIXME disabling group deletes for now until we verify the logic is OK
+        /*if (nextHopsCount.remove(nextHopIp, 1) <= 1) {
             // There was one or less next hops, so there are now none
 
             log.debug("removing group for next hop {}", nextHop);
@@ -339,7 +340,7 @@
             nextHops.remove(nextHopIp);
 
             groupService.removeGroup(deviceId, nextHop.group(), appId);
-        }
+        }*/
 
         return group;
     }