diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java b/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java
index 7f065a00d3a951d1369f9edbec21fbe221fcf86a..917d8501d6c88b949decad72c639c77d0fe0900d 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java
@@ -474,7 +474,11 @@ class OFChannelHandler
                 if (m.getTables() > 1) {
                     // likely supports L2 table extensions. Send set
                     h.sendHandshakeL2TableSet();
-                    h.setState(WAIT_SET_L2_TABLE_REPLY);
+                    // TODO: no L2 SET reply yet, so fire and forget the set
+                    // table message and move directly to sendHandshakeConfig
+                    h.sendHandshakeSetConfig();
+                    h.setState(WAIT_CONFIG_REPLY);
+                    //h.setState(WAIT_SET_L2_TABLE_REPLY);
                 } else {
                     h.sendHandshakeSetConfig();
                     h.setState(WAIT_CONFIG_REPLY);
@@ -495,6 +499,7 @@ class OFChannelHandler
         WAIT_SET_L2_TABLE_REPLY(false) {
             @Override void processOFVendor(OFChannelHandler h, OFVendor m)
                     throws IOException {
+                // TODO: actually parse the response
                 h.sendHandshakeSetConfig();
                 h.setState(WAIT_CONFIG_REPLY);
             };