diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java b/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
index 16f3b94..6d3f938 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
@@ -141,6 +141,10 @@
     void addFilterToDevice(DeviceId deviceId, PortNumber port, VlanId assignedVlan,
                            IpAddress mcastIp, McastRole mcastRole) {
 
+        if (!srManager.deviceConfiguration().isConfigured(deviceId)) {
+            log.debug("skip update of fitering objective for unconfigured device: {}", deviceId);
+            return;
+        }
         MacAddress routerMac = getRouterMac(deviceId, port);
 
         if (MacAddress.NONE.equals(routerMac)) {
@@ -170,6 +174,10 @@
     void removeFilterToDevice(DeviceId deviceId, PortNumber port, VlanId assignedVlan,
                               IpAddress mcastIp, McastRole mcastRole) {
 
+        if (!srManager.deviceConfiguration().isConfigured(deviceId)) {
+            log.debug("skip update of fitering objective for unconfigured device: {}", deviceId);
+            return;
+        }
         MacAddress routerMac = getRouterMac(deviceId, port);
 
         if (MacAddress.NONE.equals(routerMac)) {