diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 50686d2..5a08698 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -2999,7 +2999,7 @@
 +
 If true the deprecated `/query` URL is available to return JSON
 and text results for changes. If false, the URL is disabled and
-returns 404 to clients. Default is true, enabling `/query`.
+returns 404 to clients. Default is false, disabling `/query`.
 
 [[ssh-alias]]
 === Section ssh-alias
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
index 4651959..a5d61f7 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
@@ -58,7 +58,7 @@
 
     @Inject
     UrlConfig(@GerritServerConfig Config cfg) {
-      deprecatedQuery = cfg.getBoolean("site", "enableDeprecatedQuery", true);
+      deprecatedQuery = cfg.getBoolean("site", "enableDeprecatedQuery", false);
     }
   }