diff --git a/main.go b/main.go
index 7ff001d..2cc9d03 100644
--- a/main.go
+++ b/main.go
@@ -267,7 +267,8 @@ func runServer(sockPath, pidPath string) {
 	})
 
 	// Start D-Bus adapter (best-effort; pure 9P still works without it).
-	if !*nodbus {
+	// -tcp implies -nodbus (remote/headless deployments have no session bus).
+	if !*nodbus && *tcpAddr == "" {
 		dbusAdapter = startDBus(mgr)
 		dbusAdapter.WatchExisting()
 	}