diff --git a/queries/java/indents.scm b/queries/java/indents.scm
index d1ba54833..cff699667 100644
--- a/queries/java/indents.scm
+++ b/queries/java/indents.scm
@@ -25,4 +25,4 @@
   ")"
 ] @indent_end
 
-[(block_comment) (line_comment)] @ignore
+(line_comment) @ignore
diff --git a/tests/indent/java/javadoc.java b/tests/indent/java/javadoc.java
new file mode 100644
index 000000000..94ac9b7e3
--- /dev/null
+++ b/tests/indent/java/javadoc.java
@@ -0,0 +1,5 @@
+public class Foo {
+  /**
+  */
+  void foo() {}
+}
diff --git a/tests/indent/java_spec.lua b/tests/indent/java_spec.lua
index ff14f6b2b..7b2651b2a 100644
--- a/tests/indent/java_spec.lua
+++ b/tests/indent/java_spec.lua
@@ -22,5 +22,6 @@ describe("indent Java:", function()
     run:new_line("class_with_annotation.java", { on_line = 2, text = "void foo() {}", indent = 2 })
     run:new_line("enum_with_annotation.java", { on_line = 2, text = "THING;", indent = 2 })
     run:new_line("interface.java", { on_line = 1, text = "void foo();", indent = 2 })
+    run:new_line("javadoc.java", { on_line = 2, text = "* Sample javadoc line", indent = 2 })
   end)
 end)