diff --git a/host/commands/launch/main.cc b/host/commands/launch/main.cc
index eab020c..562167a 100644
--- a/host/commands/launch/main.cc
+++ b/host/commands/launch/main.cc
@@ -349,7 +349,7 @@
 }
 
 bool AdbConnectorEnabled() {
-  return FLAGS_run_adb_connector;
+  return FLAGS_run_adb_connector && AdbTunnelEnabled();
 }
 
 void LaunchIvServer() {