diff --git a/framework/python/src/core/testrun.py b/framework/python/src/core/testrun.py
index d11527316..95011c58b 100644
--- a/framework/python/src/core/testrun.py
+++ b/framework/python/src/core/testrun.py
@@ -81,7 +81,9 @@ def __init__(self,
 
     self._net_only = net_only
     self._single_intf = single_intf
-    self._no_ui = no_ui
+    # Network only option only works if UI is also
+    # disbled so need to set no_ui if net_only is selected
+    self._no_ui = no_ui or net_only
 
     # Catch any exit signals
     self._register_exits()
diff --git a/framework/python/src/net_orc/network_orchestrator.py b/framework/python/src/net_orc/network_orchestrator.py
index ed90fabbf..27af4e1c7 100644
--- a/framework/python/src/net_orc/network_orchestrator.py
+++ b/framework/python/src/net_orc/network_orchestrator.py
@@ -224,7 +224,9 @@ def _device_discovered(self, mac_addr):
     #self._ovs.add_arp_inspection_filter(ip_address=device.ip_addr,
     #  mac_address=device.mac_addr)
 
-    self._start_device_monitor(device)
+    # Don't monitor devices when in network only mode
+    if 'net_only' not in self._session.get_runtime_params():
+      self._start_device_monitor(device)
 
   def _get_conn_stats(self):
     """ Extract information about the physical connection