diff --git a/libraries/kotlinx-metadata/jvm/ChangeLog.md b/libraries/kotlinx-metadata/jvm/ChangeLog.md
index 24959b43aa9..559400f9251 100644
--- a/libraries/kotlinx-metadata/jvm/ChangeLog.md
+++ b/libraries/kotlinx-metadata/jvm/ChangeLog.md
@@ -1,5 +1,9 @@
 # kotlinx-metadata-jvm
 
+## 0.0.4
+
+- [`KT-25223`](https://youtrack.jetbrains.com/issue/KT-25223) Add JvmFunctionExtensionVisitor.visitEnd
+
 ## 0.0.3
 
 - Support metadata of local delegated properties (see `JvmDeclarationContainerExtensionVisitor.visitLocalDelegatedProperty`)
diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/JvmMetadataExtensions.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/JvmMetadataExtensions.kt
index 23bbc867e43..39b979a2dda 100644
--- a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/JvmMetadataExtensions.kt
+++ b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/impl/JvmMetadataExtensions.kt
@@ -52,6 +52,8 @@ internal class JvmMetadataExtensions : MetadataExtensions {
         if (lambdaClassOriginName != null) {
             ext.visitLambdaClassOriginName(c[lambdaClassOriginName])
         }
+
+        ext.visitEnd()
     }
 
     override fun readPropertyExtensions(v: KmPropertyVisitor, proto: ProtoBuf.Property, c: ReadContext) {
diff --git a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt
index 59f3d215394..7c430d94f75 100644
--- a/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt
+++ b/libraries/kotlinx-metadata/jvm/src/kotlinx/metadata/jvm/jvmExtensions.kt
@@ -122,6 +122,13 @@ open class JvmFunctionExtensionVisitor @JvmOverloads constructor(
         delegate?.visitLambdaClassOriginName(internalName)
     }
 
+    /**
+     * Visits the end of JVM extensions for the function.
+     */
+    open fun visitEnd() {
+        delegate?.visitEnd()
+    }
+
     companion object {
         /**
          * The type of this extension visitor.