diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 38a5e14c946..c092fd5f012 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -195,6 +195,7 @@ open-network-stream
 	(make-network-process :name name :buffer buffer
 			      :host (puny-encode-domain host) :service service
 			      :nowait (plist-get parameters :nowait)
+			      :noquery (plist-get parameters :noquery)
                               :tls-parameters
                               (plist-get parameters :tls-parameters)
                               :coding (plist-get parameters :coding))
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 0a0d73eb6d2..204121045a0 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1200,7 +1200,8 @@ eglot--connect
                                (pcase-let ((`(,connection . ,inferior)
                                             (eglot--inferior-bootstrap
                                              readable-name
-                                             contact)))
+                                             contact
+                                             '(:noquery t))))
                                  (setq autostart-inferior-process inferior)
                                  connection))))
                 ((stringp (car contact))