diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/providers/CpProvider.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/providers/CpProvider.java
index 23618c0..1e5b6fa 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/providers/CpProvider.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/providers/CpProvider.java
@@ -114,13 +114,14 @@
             DeviceDescription descriptionBase = new DefaultDeviceDescription(
                     deviceId.uri(), type, "cp", "0.1", "0.1", id, chassisId),
                     description = new DefaultDeviceDescription(descriptionBase, annotations);
-
-            providerService.deviceConnected(deviceId, description);
+            // FIXME: MWC-2018 not registering device as it upsets SR
+            // providerService.deviceConnected(deviceId, description);
         }
 
         @Override
         public void deviceRemoved(String id) {
-            providerService.deviceDisconnected(deviceId("cp:" + id));
+            // FIXME: MWC-2018 same as before
+            // providerService.deviceDisconnected(deviceId("cp:" + id));
         }
     }
 }