diff --git a/ait/core/server/broker.py b/ait/core/server/broker.py
index 6908c7af..92ec2ad9 100644
--- a/ait/core/server/broker.py
+++ b/ait/core/server/broker.py
@@ -9,6 +9,7 @@
 import ait.core.server
 from ait.core import log
 from .config import ZmqConfig
+from .utils import is_valid_address_spec
 
 
 class Broker(gevent.Greenlet):
@@ -69,7 +70,11 @@ def _subscribe_all(self):
         """
         for stream in self.inbound_streams + self.outbound_streams:
             for input_ in stream.inputs:
-                if not type(input_) is int and input_ is not None:
+                if (
+                    not type(input_) is int
+                    and input_ is not None
+                    and not is_valid_address_spec(input_)
+                ):
                     Broker.subscribe(stream, input_)
 
         for plugin in self.plugins:
diff --git a/docker/network-test-config.yaml b/docker/network-test-config.yaml
index 8cc3cb1c..8f80629a 100644
--- a/docker/network-test-config.yaml
+++ b/docker/network-test-config.yaml
@@ -16,6 +16,7 @@ default:
                     - input_stream_debug_1
                     - input_stream_debug_2
                     - input_stream_debug_3
+                    - input_stream_debug_5
                 handlers:
                     - name: ait.core.server.handlers.DebugHandler
                       handler_name: "Input Stream Handler"
@@ -45,6 +46,13 @@ default:
                     - name: ait.core.server.handlers.DebugHandler
                       handler_name: "TCP Input Client Stream 3"
 
+            - stream:
+                name: input_stream_debug_5
+                input: 6969
+                handlers:
+                    - name: ait.core.server.handlers.DebugHandler
+                      handler_name: "TCP Input Client Stream 4"
+
         outbound-streams:
             - stream:
                 name: output_stream_debug_1