diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
index 8feb385297..99a96503bb 100644
--- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -109,9 +109,6 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr
 
     @Deactivate
     public void deactivate() {
-        for (OpenFlowSwitch sw : controller.getSwitches()) {
-            providerService.deviceDisconnected(DeviceId.deviceId(uri(sw.getId())));
-        }
         providerRegistry.unregister(this);
         controller.removeListener(listener);
         providerService = null;
diff --git a/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java b/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
index ab2a92e5e4..8fb5b7910e 100644
--- a/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
+++ b/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
@@ -97,7 +97,6 @@ public class OpenFlowDeviceProviderTest {
     @After
     public void tearDown() {
         provider.deactivate();
-        assertTrue("devices should be removed", registry.connected.isEmpty());
         assertNull("listener should be removed", controller.listener);
         provider.controller = null;
         provider.providerRegistry = null;