diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 07bc6cd2f..3bc7fcdd6 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -221,6 +221,7 @@
   "else"
   "switch"
   "case"
+  "when"
 ] @keyword.conditional
 
 (ternary_expression