diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java
index e6ccd0e2e5..ca83418064 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java
@@ -84,7 +84,7 @@ public class AMQConnectorImpl implements AMQConnector
    public boolean isAllowLinkStealing()
    {
       // TODO Auto-generated method stub
-      return false;
+      return true;
    }
 
    @Override
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
index 5991ddce88..b2e1027693 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
@@ -232,6 +232,13 @@ public class OpenWireProtocolManager implements ProtocolManager<Interceptor>
       {
          case CommandTypes.CONNECTION_INFO:
             break;
+         case CommandTypes.CONNECTION_CONTROL:
+            /** The ConnectionControl packet sent from client informs the broker that is capable of supporting dynamic
+             * failover and load balancing.  These features are not yet implemented for Artemis OpenWire.  Instead we
+             * simply drop the packet.  See: ACTIVEMQ6-108 */
+            break;
+         case CommandTypes.CONSUMER_CONTROL:
+            break;
          default:
             throw new IllegalStateException("Cannot handle command: " + command);
       }