diff --git a/MODULE.bazel b/MODULE.bazel
index 233e6df1..ea2cdcb2 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -31,6 +31,12 @@ bazel_dep(
     version = "0.36.0",
     repo_name = "bazel_gazelle",
 )
+git_override(
+    module_name = "gazelle",
+    commit = "ba2ce367a545e0bdd74a7abca40ef5e0a0cb8dcb",
+    remote = "https://github.com/bazelbuild/bazel-gazelle.git",
+)
+
 bazel_dep(
     name = "protobuf",
     version = PROTOBUF_VERSION,
diff --git a/examples/gazelle/MODULE.bazel b/examples/gazelle/MODULE.bazel
index c01c0032..e0fc8df1 100644
--- a/examples/gazelle/MODULE.bazel
+++ b/examples/gazelle/MODULE.bazel
@@ -43,3 +43,8 @@ bazel_dep(
     name = "gazelle",
     version = "0.36.0",
 )
+git_override(
+    module_name = "gazelle",
+    commit = "ba2ce367a545e0bdd74a7abca40ef5e0a0cb8dcb",
+    remote = "https://github.com/bazelbuild/bazel-gazelle.git",
+)
diff --git a/repositories.bzl b/repositories.bzl
index dddfb19e..86950e23 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -100,12 +100,13 @@ def contrib_rules_jvm_gazelle_deps():
         ],
     )
 
-    # We need https://github.com/bazelbuild/bazel-gazelle/pull/1686
+    # We need https://github.com/bazelbuild/bazel-gazelle/pull/1798
     maybe(
         http_archive,
         name = "bazel_gazelle",
-        sha256 = "75df288c4b31c81eb50f51e2e14f4763cb7548daae126817247064637fd9ea62",
-        url = "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
+        sha256 = "d1d72a9abd6dee362354274fa9b60ced8f50ee1f10f9b9fef90b4acfb98d477b",
+        strip_prefix = "bazel-gazelle-ba2ce367a545e0bdd74a7abca40ef5e0a0cb8dcb",
+        url = "https://github.com/bazelbuild/bazel-gazelle/archive/ba2ce367a545e0bdd74a7abca40ef5e0a0cb8dcb.zip",
     )
 
     maybe(