diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
index d4872db..f44c625 100644
--- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
+++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
@@ -182,9 +182,7 @@
 
     @Deactivate
     public void deactivate() {
-        if (!connectedSwitches.isEmpty()) {
-            cleanup();
-        }
+        cleanup();
         cfgService.unregisterProperties(getClass(), false);
     }