diff --git a/cmd/discosrv/querysrv.go b/cmd/discosrv/querysrv.go
index 57cdba00d..48560ee01 100644
--- a/cmd/discosrv/querysrv.go
+++ b/cmd/discosrv/querysrv.go
@@ -55,6 +55,7 @@ func (s *querysrv) Serve() {
 	}
 
 	http.HandleFunc("/", s.handler)
+	http.HandleFunc("/ping", handlePing)
 
 	tlsListener, err := tls.Listen("tcp", s.addr, tlsCfg)
 	if err != nil {
@@ -390,3 +391,7 @@ func (s *querysrv) getRelays(device protocol.DeviceID) ([]annRelay, error) {
 
 	return res, nil
 }
+
+func handlePing(w http.ResponseWriter, r *http.Request) {
+	w.WriteHeader(204)
+}