diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
index ba664d0d3f0..2e7d6fa1389 100644
--- a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -305,7 +305,7 @@ open class KotlinFileExtractor(
                 val kind = c.kind
                 if (kind == ClassKind.ENUM_CLASS) {
                     tw.writeIsEnumType(classId)
-                } else if (kind != ClassKind.CLASS && kind != ClassKind.OBJECT) {
+                } else if (kind != ClassKind.CLASS && kind != ClassKind.OBJECT && kind != ClassKind.ENUM_ENTRY) {
                     logger.errorElement("Unrecognised class kind $kind", c)
                 }
             }
@@ -452,7 +452,7 @@ open class KotlinFileExtractor(
                     val kind = c.kind
                     if (kind == ClassKind.ENUM_CLASS) {
                         tw.writeIsEnumType(classId)
-                    } else if (kind != ClassKind.CLASS && kind != ClassKind.OBJECT) {
+                    } else if (kind != ClassKind.CLASS && kind != ClassKind.OBJECT && kind != ClassKind.ENUM_ENTRY) {
                         logger.warnElement("Unrecognised class kind $kind", c)
                     }
 
diff --git a/java/ql/test/kotlin/library-tests/methods/diagnostics.expected b/java/ql/test/kotlin/library-tests/methods/diagnostics.expected
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/java/ql/test/kotlin/library-tests/methods/diagnostics.ql b/java/ql/test/kotlin/library-tests/methods/diagnostics.ql
new file mode 100644
index 00000000000..1774650beff
--- /dev/null
+++ b/java/ql/test/kotlin/library-tests/methods/diagnostics.ql
@@ -0,0 +1,4 @@
+import java
+import semmle.code.java.Diagnostics
+
+select any(Diagnostic d | not d.toString().matches("Not rewriting trap file for%"))