diff --git a/WORKSPACE b/WORKSPACE
index 0c602bf1f5..346ab7914b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -18,8 +18,10 @@ versions.check(
     # Keep this version in sync with:
     #  * The BAZEL environment variable defined in .github/workflows/ci.yml, which is used for CI and nightly builds.
     minimum_bazel_version = "4.2.2",
-    # TODO(https://github.com/tensorflow/tensorboard/issues/6115): Support building TensorBoard with Bazel version >= 6.0.0
-    maximum_bazel_version = "5.4.0",
+    # Preemptively assume the next Bazel major version will break us, since historically they do,
+    # and provide a clean error message in that case. Since the maximum version is inclusive rather
+    # than exclusive, we set it to the 999th patch release of the current major version.
+    maximum_bazel_version = "6.999.0",
 )
 
 http_archive(