diff --git a/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java b/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
index a3ee137..cd9467a 100644
--- a/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
+++ b/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
@@ -221,8 +221,8 @@
         } else {
             deviceIds.add(config.getDeviceId(sid));
         }
-
-        NeighborSet ns = new NeighborSet(deviceIds, tunnel.labelIds().get(2));
+        // For these NeighborSet isMpls is meaningless.
+        NeighborSet ns = new NeighborSet(deviceIds, false, tunnel.labelIds().get(2));
 
         // If the tunnel reuses any existing groups, then tunnel handler
         // should not remove the group.
@@ -232,7 +232,7 @@
             tunnel.allowToRemoveGroup(true);
         }
 
-        return groupHandlerMap.get(deviceId).getNextObjectiveId(ns, null);
+        return groupHandlerMap.get(deviceId).getNextObjectiveId(ns, null, true);
     }
 
 }