diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/ECDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/ECDeviceStore.java
index 2631fff..d34a647 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/ECDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/ECDeviceStore.java
@@ -288,7 +288,7 @@
         } else {
             // Only forward for ConfigProvider
             // Forwarding was added as a workaround for ONOS-490
-            if (!providerId.equals("cfg")) {
+            if (!providerId.scheme().equals("cfg")) {
                 return null;
             }
             DeviceInjectedEvent deviceInjectedEvent = new DeviceInjectedEvent(providerId, deviceId, deviceDescription);
@@ -420,7 +420,7 @@
         } else {
             // Only forward for ConfigProvider
             // Forwarding was added as a workaround for ONOS-490
-            if (!providerId.equals("cfg")) {
+            if (!providerId.scheme().equals("cfg")) {
                 return null;
             }
             if (master == null) {
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index 14648a5..333531e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -332,7 +332,7 @@
         } else {
             // Only forward for ConfigProvider
             // Forwarding was added as a workaround for ONOS-490
-            if (!providerId.equals("cfg")) {
+            if (!providerId.scheme().equals("cfg")) {
                 return null;
             }
             // FIXME Temporary hack for NPE (ONOS-1171).
@@ -585,7 +585,7 @@
         } else {
             // Only forward for ConfigProvider
             // Forwarding was added as a workaround for ONOS-490
-            if (!providerId.equals("cfg")) {
+            if (!providerId.scheme().equals("cfg")) {
                 return null;
             }
             // FIXME Temporary hack for NPE (ONOS-1171).