diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
index cb7c54f..ed450f2 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
@@ -99,6 +99,11 @@
             }
             // For each switch check if a controller exists in controller registry
             for (Switch sw : switches) {
+                // FIXME How to handle case where Switch has never been
+                // registered to ZK
+                if (sw.getConfigState() == ConfigState.CONFIGURED) {
+                    continue;
+                }
                 try {
                     String controller =
                             registryService.getControllerForSwitch(sw.getDpid().value());